r4878 - in software/ui: . debian src

[Enrico Zini]

Author: enrico
Date: 2007-12-09 12:23:49 +0000 (Sun, 09 Dec 2007)
New Revision: 4878

Modified:
   software/ui/
   software/ui/debian/changelog
   software/ui/src/goplay.cpp
   software/ui/src/pkgbrowser.cpp
Log:
Last code fixes to appease gcc 4.3


Property changes on: software/ui
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-09 12:13:04.611999989 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

   + timestamp: 2007-12-09 12:23:29.217000008 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

Name: bzr:revision-id:v3-single-software/ui
   - 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj
110 enrico at enricozini.org-20071209110551-33y5jxsqejx92fq3
111 enrico at enricozini.org-20071209112332-1rf57dt9r853hdxn
112 enrico at enricozini.org-20071209113708-u77ke5c0ubb5gecl
113 enrico at enricozini.org-20071209113759-tc79y911o01c01rb
114 enrico at enricozini.org-20071209115326-qm81khq7dslw4o63
115 enrico at enricozini.org-20071209121110-51l0kx2mq9hi3984
116 enrico at enricozini.org-20071209121304-o6z6a0knyhqed5fo

   + 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj
110 enrico at enricozini.org-20071209110551-33y5jxsqejx92fq3
111 enrico at enricozini.org-20071209112332-1rf57dt9r853hdxn
112 enrico at enricozini.org-20071209113708-u77ke5c0ubb5gecl
113 enrico at enricozini.org-20071209113759-tc79y911o01c01rb
114 enrico at enricozini.org-20071209115326-qm81khq7dslw4o63
115 enrico at enricozini.org-20071209121110-51l0kx2mq9hi3984
116 enrico at enricozini.org-20071209121304-o6z6a0knyhqed5fo
117 enrico at enricozini.org-20071209122329-rohhzh0tldsso0bx


Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	2007-12-09 12:13:22 UTC (rev 4877)
+++ software/ui/debian/changelog	2007-12-09 12:23:49 UTC (rev 4878)
@@ -8,8 +8,9 @@
        filters.  This avoids the interface getting inconsistent in some cases.
      - Get all the results out of Xapian, not just the top 100.
        Closes: bug#447333.
+     - Small code fixes to appease GCC 4.3.  Closes: bug#455137.
 
- -- Enrico Zini <enrico at debian.org>  Sun, 09 Dec 2007 12:11:15 +0000
+ -- Enrico Zini <enrico at debian.org>  Sun, 09 Dec 2007 12:22:12 +0000
 
 goplay (0.1-1) unstable; urgency=low
 

Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp	2007-12-09 12:13:22 UTC (rev 4877)
+++ software/ui/src/goplay.cpp	2007-12-09 12:23:49 UTC (rev 4878)
@@ -44,6 +44,9 @@
 #ifdef USE_GETTEXT
 #include <libintl.h>
 #include <locale.h>
+#else
+// Work-around until goplay is actually gettextised
+#define gettext(a) (a)
 #endif
 
 #include <FL/Fl.H>

Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2007-12-09 12:13:22 UTC (rev 4877)
+++ software/ui/src/pkgbrowser.cpp	2007-12-09 12:23:49 UTC (rev 4878)
@@ -28,6 +28,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "pkgbrowser.h"
 #include "ui.h"
 #include "common.h"
@@ -45,6 +49,14 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#ifdef USE_GETTEXT
+#include <libintl.h>
+#include <locale.h>
+#else
+// Work-around until goplay is actually gettextised
+#define gettext(a) (a)
+#endif
+
 #include <FL/Fl_PNG_Image.H>
 #include <FL/Fl_JPEG_Image.H>
 #include <FL/Fl_BMP_Image.H>