r4870 - in software/ui: . debian src

[Enrico Zini]

Author: enrico
Date: 2007-12-09 11:06:09 +0000 (Sun, 09 Dec 2007)
New Revision: 4870

Modified:
   software/ui/
   software/ui/debian/changelog
   software/ui/src/goplay.cpp
Log:
(re)apply fix for #441120


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

   + timestamp: 2007-12-09 11:05:51.026999950 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

Name: bzr:file-ids
   - debian/goplay.xpm	goplay.xpm-20071209105641-jkkfgwmuzv3f9hqd-6
debian/copyright	copyright-20071209105641-jkkfgwmuzv3f9hqd-2
debian/changelog	changelog-20071209105641-jkkfgwmuzv3f9hqd-1
debian/docs	docs-20071209105641-jkkfgwmuzv3f9hqd-3
debian/goplay.desktop	goplay.desktop-20071209105641-jkkfgwmuzv3f9hqd-4
debian/install	install-20071209105641-jkkfgwmuzv3f9hqd-5
debian/menu	menu-20071209105641-jkkfgwmuzv3f9hqd-7

   + 
Name: bzr:revision-id:v3-single-software/ui
   - 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj

   + 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj
110 enrico at enricozini.org-20071209110551-33y5jxsqejx92fq3


Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	2007-12-09 10:59:11 UTC (rev 4869)
+++ software/ui/debian/changelog	2007-12-09 11:06:09 UTC (rev 4870)
@@ -1,3 +1,12 @@
+goplay (0.2-1) unstable; urgency=low
+
+  * New upstream version
+     - Use the Xapian term prefixes used by apt-xapian-index
+     - Use a non-const string to work around fltk's non const-cleaniness.
+       Closes: bug#441120
+
+ -- Enrico Zini <enrico at debian.org>  Sun, 09 Dec 2007 11:04:24 +0000
+
 goplay (0.1-1) unstable; urgency=low
 
   * Initial release.

Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp	2007-12-09 10:59:11 UTC (rev 4869)
+++ software/ui/src/goplay.cpp	2007-12-09 11:06:09 UTC (rev 4870)
@@ -144,10 +144,14 @@
 		return "";
 }
 
-static char *VoidString = "";
-
 static void UpdateUILists(GamesUI& ui)
 {
+	// Defining this here, non-const, because fltk's interface want non-const
+	// strings and I did not have time to check whether it would attempt to
+	// modify the parameter or not.  Likely not, and thus a
+	// const_cast<char*>(VoidString) would probably have been better.
+	// --Enrico
+	char VoidString[1] = "";
 	Engine& engine = *ui.engine;
 	const char* oldType = ReadFlChoice(*ui.TypeSelection);
 	const char* oldIface = ReadFlChoice(*ui.InterfaceSelection);