diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2008-11-07 21:27:18 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2008-11-07 21:27:18 (GMT) |
| commit | c47debd13e822c5ec4639cc8c40310f06fce0ad2 (patch) | |
| tree | ac7482fed26e5992031a75387b73a9595fd38458 | |
| parent | cb77579bb0bf7ef88b8a17720150c56e17219edb (diff) | |
Fixes to compile on ubuntu 8.10
svn path=/trunk/; revision=3595
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/boards/colors.c | 2 | ||||
| -rw-r--r-- | src/gcompris/config.c | 1 | ||||
| -rw-r--r-- | src/gcompris/gcompris_db.c | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2008-11-07 Bruno coudoin <bruno.coudoin@free.fr> + + Fixes to compile on Ubuntu 8.10 + + * src/boards/colors.c: (repeat): + * src/gcompris/config.c: + * src/gcompris/gcompris_db.c: (gc_db_get_board_from_id): + *** RELEASE 8.4.8 *** 2008-10-28 Yavor Doganov <yavor@gnu.org> (tiny change) diff --git a/src/boards/colors.c b/src/boards/colors.c index ff525cc..a5ace77 100644 --- a/src/boards/colors.c +++ b/src/boards/colors.c @@ -327,7 +327,7 @@ static void repeat (){ 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 (), diff --git a/src/gcompris/config.c b/src/gcompris/config.c index 5d29f90..f8014b4 100644 --- a/src/gcompris/config.c +++ b/src/gcompris/config.c @@ -101,6 +101,7 @@ static gchar *linguas[] = { "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"), diff --git a/src/gcompris/gcompris_db.c b/src/gcompris/gcompris_db.c index 3cac8bc..d442ccc 100644 --- a/src/gcompris/gcompris_db.c +++ b/src/gcompris/gcompris_db.c @@ -1725,7 +1725,7 @@ GcomprisBoard *gc_db_get_board_from_id(int board_id) 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; |