gcompris r3596 - in branches/GCOMPRIS_8_3: . src/boards src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Fri Nov  7 21:38:16 2008
New Revision: 3596
URL: http://svn.gnome.org/viewvc/gcompris?rev=3596&view=rev

Log:
fixes to compile on ubuntu 8.10


Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/src/boards/colors.c
   branches/GCOMPRIS_8_3/src/gcompris/config.c
   branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.c

Modified: branches/GCOMPRIS_8_3/src/boards/colors.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/colors.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/colors.c	Fri Nov  7 21:38:16 2008
@@ -328,7 +328,7 @@
 
       g_free(str);
 
-      str = g_strdup_printf(gettext(colors[GPOINTER_TO_INT(g_list_nth_data(listColors, 0))*2+1]));
+      str = g_strdup(gettext(colors[GPOINTER_TO_INT(g_list_nth_data(listColors, 0))*2+1]));
 
       gnome_canvas_item_new (boardRootItem,
 			     gnome_canvas_text_get_type (),

Modified: branches/GCOMPRIS_8_3/src/gcompris/config.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/config.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/config.c	Fri Nov  7 21:38:16 2008
@@ -102,6 +102,7 @@
   "oc_FR.UTF-8",	N_("Occitan (languedocien)"),
   "pl_PL.UTF-8",	N_("Polish"),
   "pt_PT.UTF-8",	N_("Portuguese"),
+  "pa_IN.UTF-8",	N_("Punjabi"),
   "pt_BR.UTF-8",	N_("Portuguese (Brazil)"),
   "ro_RO.UTF-8",	N_("Romanian"),
   "ru_RU.UTF-8",	N_("Russian"),

Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.c	Fri Nov  7 21:38:16 2008
@@ -1727,7 +1727,7 @@
   gcomprisBoard->gmodule_file = NULL;
 
   /* From DB we have only package_data_dir. */
-  gcomprisBoard->board_dir = g_strdup_printf(properties->package_data_dir);
+  gcomprisBoard->board_dir = g_strdup(properties->package_data_dir);
 
   /* Fixed since I use the canvas own pixel_per_unit scheme */
   gcomprisBoard->width  = BOARDWIDTH;