[gcompris] New upstream release 11.12 Drop our patches (all upstreamed)
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Jan 2 09:58:34 UTC 2012
commit 079d3be98e6780ec8b0f4f574fe565214ddd69c1
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Jan 2 10:59:36 2012 +0100
New upstream release 11.12
Drop our patches (all upstreamed)
gcompris-11.12-deprecated.patch | 1164 +++++++++++++++++++++++++++++++++++++++
gcompris.spec | 2 +
2 files changed, 1166 insertions(+), 0 deletions(-)
---
diff --git a/gcompris-11.12-deprecated.patch b/gcompris-11.12-deprecated.patch
new file mode 100644
index 0000000..00944ef
--- /dev/null
+++ b/gcompris-11.12-deprecated.patch
@@ -0,0 +1,1164 @@
+diff -up gcompris-11.12/src/algebra_guesscount-activity/algebra_guesscount.c~ gcompris-11.12/src/algebra_guesscount-activity/algebra_guesscount.c
+--- gcompris-11.12/src/algebra_guesscount-activity/algebra_guesscount.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/algebra_guesscount-activity/algebra_guesscount.c 2012-01-02 10:14:22.073647503 +0100
+@@ -684,8 +684,15 @@ static gboolean item_event_num (GooCanva
+ static void destroy_board() {
+ int i;
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ for (i=0; i<NUM_VALUES; i++)
+ gdk_pixbuf_unref(num_pixmap[i]);
+ for (i=0; i<5; i++)
+ gdk_pixbuf_unref(oper_pixmap[i]);
++#else
++ for (i=0; i<NUM_VALUES; i++)
++ g_object_unref(num_pixmap[i]);
++ for (i=0; i<5; i++)
++ g_object_unref(oper_pixmap[i]);
++#endif
+ }
+diff -up gcompris-11.12/src/awele-activity/awele.c~ gcompris-11.12/src/awele-activity/awele.c
+--- gcompris-11.12/src/awele-activity/awele.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/awele-activity/awele.c 2012-01-02 10:17:55.207634985 +0100
+@@ -297,9 +297,15 @@ awele_destroy_all_items ()
+ {
+ for (i = 0; i < NBHOLE / 2; i++)
+ {
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(graphsElt->pixbufButton[i]);
+ gdk_pixbuf_unref(graphsElt->pixbufButtonNotify[i]);
+ gdk_pixbuf_unref(graphsElt->pixbufButtonClicked[i]);
++#else
++ g_object_unref(graphsElt->pixbufButton[i]);
++ g_object_unref(graphsElt->pixbufButtonNotify[i]);
++ g_object_unref(graphsElt->pixbufButtonClicked[i]);
++#endif
+ }
+ g_free(graphsElt);
+ graphsElt = NULL;
+@@ -335,7 +341,11 @@ awele_create_item (GooCanvasItem * paren
+ 0,
+ OFFSET_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ /*
+ * Display text
+diff -up gcompris-11.12/src/babymatch-activity/shapegame.c~ gcompris-11.12/src/babymatch-activity/shapegame.c
+--- gcompris-11.12/src/babymatch-activity/shapegame.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/babymatch-activity/shapegame.c 2012-01-02 10:44:16.315542017 +0100
+@@ -493,8 +493,13 @@ static void destroy_shape (Shape *shape)
+ g_free(shape->targetfile);
+ g_free(shape->soundfile);
+ g_free(shape->tooltip);
+- if(shape->pixmap)
++ if(shape->pixmap) {
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(shape->pixmap);
++#else
++ g_object_unref(shape->pixmap);
++#endif
++ }
+ g_free(shape);
+ }
+
+@@ -758,7 +763,11 @@ add_shape_to_list_of_shapes(Shape *shape
+ GdkPixbuf *scale, *hand;
+
+ scale = gdk_pixbuf_scale_simple(pixmap, w, h, GDK_INTERP_BILINEAR);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ pixmap = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE, 8,
+ ICON_WIDTH, ICON_HEIGHT);
+@@ -766,7 +775,11 @@ add_shape_to_list_of_shapes(Shape *shape
+ // add the shape
+ gdk_pixbuf_copy_area( scale, 0, 0, w, h,
+ pixmap, (ICON_WIDTH-w )/2, (ICON_HEIGHT-h)/2 );
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(scale);
++#else
++ g_object_unref(scale);
++#endif
+
+ // add the hand
+ hand = gc_pixmap_load("shapegame/hand.svg");
+@@ -775,8 +788,13 @@ add_shape_to_list_of_shapes(Shape *shape
+ scale = gdk_pixbuf_scale_simple(hand, w, h, GDK_INTERP_BILINEAR);
+ gdk_pixbuf_copy_area(scale, 0, 0, w, h,
+ pixmap, ICON_WIDTH-w,0);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(hand);
+ gdk_pixbuf_unref(scale);
++#else
++ g_object_unref(hand);
++ g_object_unref(scale);
++#endif
+
+ w = ICON_WIDTH;
+ h = ICON_HEIGHT;
+@@ -793,7 +811,11 @@ add_shape_to_list_of_shapes(Shape *shape
+ y_offset - h/2);
+ goo_canvas_item_scale(item, z, z);
+ g_object_set_data(G_OBJECT(item), "z", GINT_TO_POINTER((int)(z * 1000)));
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ icon_shape = create_shape(SHAPE_ICON, shape->name, shape->tooltip,
+ shape->pixmapfile, shape->targetfile,
+@@ -1012,7 +1034,11 @@ item_event_drag(GooCanvasItem *item,
+ GOO_CANVAS_ITEM_INVISIBLE, NULL);
+ g_object_set(shadow_item, "pointer-events",
+ GOO_CANVAS_EVENTS_NONE, NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(dest);
++#else
++ g_object_unref(dest);
++#endif
+ }
+ dragged = shape->item;
+ gc_drag_item_move(event, NULL);
+@@ -1419,7 +1445,11 @@ add_shape_to_canvas(Shape *shape)
+ shape->zoomx, shape->zoomy);
+
+ shape->targetitem = item;
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(targetpixmap);
++#else
++ g_object_unref(targetpixmap);
++#endif
+ }
+ // An empty targetfile means no target and no point
+ }
+diff -up gcompris-11.12/src/boards/menu2.c~ gcompris-11.12/src/boards/menu2.c
+--- gcompris-11.12/src/boards/menu2.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/boards/menu2.c 2012-01-02 10:32:47.984582488 +0100
+@@ -338,7 +338,11 @@ create_panel(GooCanvasItem *parent)
+ y,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ y += int_y + icon_size_panel;
+
+@@ -556,7 +560,11 @@ static void menu_create_item(GooCanvasIt
+ }
+
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(menu_pixmap);
++#else
++ g_object_unref(menu_pixmap);
++#endif
+
+ // display menu icon ========================== END
+
+@@ -833,7 +841,11 @@ create_top(GooCanvasItem *parent, gchar
+ current_top_x,
+ current_top_y);
+ goo_canvas_item_scale(item, ratio, ratio);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ current_top_x += top_int_x + icon_size_top;
+
+diff -up gcompris-11.12/src/boards/py-mod-skin.c~ gcompris-11.12/src/boards/py-mod-skin.c
+--- gcompris-11.12/src/boards/py-mod-skin.c~ 2011-03-20 23:21:38.000000000 +0100
++++ gcompris-11.12/src/boards/py-mod-skin.c 2012-01-02 10:32:48.848582430 +0100
+@@ -69,7 +69,11 @@ py_gc_skin_pixmap_load(PyObject* self, P
+ /* Create and return the result */
+ pyresult = (PyObject*) pygobject_new((GObject*) result);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(result);
++#else
++ g_object_unref(result);
++#endif
+
+ return(pyresult);
+ }
+diff -up gcompris-11.12/src/boards/py-mod-utils.c~ gcompris-11.12/src/boards/py-mod-utils.c
+--- gcompris-11.12/src/boards/py-mod-utils.c~ 2011-12-12 23:20:43.000000000 +0100
++++ gcompris-11.12/src/boards/py-mod-utils.c 2012-01-02 10:32:47.104582557 +0100
+@@ -47,7 +47,11 @@ py_gc_pixmap_load(PyObject* self, PyObje
+ /* Create and return the result */
+ pyresult = (PyObject*) pygobject_new((GObject*) result);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(result);
++#else
++ g_object_unref(result);
++#endif
+
+ return(pyresult);
+
+diff -up gcompris-11.12/src/chess_computer-activity/chess.c~ gcompris-11.12/src/chess_computer-activity/chess.c
+--- gcompris-11.12/src/chess_computer-activity/chess.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/chess_computer-activity/chess.c 2012-01-02 10:44:36.011540851 +0100
+@@ -599,7 +599,11 @@ chess_create_item(GooCanvasItem *parent)
+ g_signal_connect(item, "button_press_event",
+ (GCallback) item_event_black, NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+ }
+ }
+diff -up gcompris-11.12/src/clickgame-activity/clickgame.c~ gcompris-11.12/src/clickgame-activity/clickgame.c
+--- gcompris-11.12/src/clickgame-activity/clickgame.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/clickgame-activity/clickgame.c 2012-01-02 10:32:45.920582623 +0100
+@@ -739,8 +739,13 @@ clickgame_create_item()
+ y,
+ NULL);
+ goo_canvas_item_scale(rev, imageZoom, imageZoom);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
+ gdk_pixbuf_unref(pixmap2);
++#else
++ g_object_unref(pixmap);
++ g_object_unref(pixmap2);
++#endif
+
+ fishitem->fwd_frames = g_slist_prepend (fishitem->fwd_frames, fwd);
+ fishitem->rev_frames = g_slist_prepend (fishitem->rev_frames, rev);
+diff -up gcompris-11.12/src/crane-activity/crane.c~ gcompris-11.12/src/crane-activity/crane.c
+--- gcompris-11.12/src/crane-activity/crane.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/crane-activity/crane.c 2012-01-02 10:44:27.003541383 +0100
+@@ -535,7 +535,11 @@ static void draw_arrow() {
+ g_signal_connect(item_arrow, "button_press_event",
+ (GCallback) arrow_event, GINT_TO_POINTER(i));
+ gc_item_focus_init(item_arrow, NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref( arrow[i].pixmap);
++#else
++ g_object_unref( arrow[i].pixmap);
++#endif
+
+ }
+
+@@ -570,7 +574,11 @@ static void draw_redhands() {
+ "height", (double) (CRANE_FRAME_IMAGE_SIZE + 5),
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ g_object_set (red_hands,
+ "visibility", GOO_CANVAS_ITEM_INVISIBLE,
+@@ -646,7 +654,11 @@ static void place_item(int x, int y, int
+ (x + 5 + ((i % CRANE_FRAME_COLUMN) * CRANE_FRAME_CELL)),
+ (y + 5 + (floor(i / CRANE_FRAME_COLUMN) * CRANE_FRAME_CELL)),
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref( pixmap);
++#else
++ g_object_unref( pixmap);
++#endif
+
+ if (active)
+ {
+diff -up gcompris-11.12/src/enumerate-activity/enumerate.c~ gcompris-11.12/src/enumerate-activity/enumerate.c
+--- gcompris-11.12/src/enumerate-activity/enumerate.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/enumerate-activity/enumerate.c 2012-01-02 10:44:09.835542379 +0100
+@@ -438,7 +438,11 @@ static GooCanvasItem *enumerate_create_i
+ g_signal_connect(item, "button-press-event",
+ (GCallback) item_event_focus, GINT_TO_POINTER(i));
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap_answer);
++#else
++ g_object_unref(pixmap_answer);
++#endif
+
+ pixmap_answer = gc_pixmap_load("enumerate/enumerate_answer.png");
+
+@@ -449,7 +453,11 @@ static GooCanvasItem *enumerate_create_i
+ current_y - ANSWER_HEIGHT/2,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap_answer);
++#else
++ g_object_unref(pixmap_answer);
++#endif
+ g_object_set (answer_item_focus[i], "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
+
+ item = goo_canvas_image_new (boardRootItem,
+@@ -463,7 +471,11 @@ static GooCanvasItem *enumerate_create_i
+ current_y - 5,
+ scale, 0.0);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ g_signal_connect(item, "button-press-event",
+ (GCallback) item_event_focus, GINT_TO_POINTER(i));
+diff -up gcompris-11.12/src/erase-activity/erase.c~ gcompris-11.12/src/erase-activity/erase.c
+--- gcompris-11.12/src/erase-activity/erase.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/erase-activity/erase.c 2012-01-02 10:44:19.307541836 +0100
+@@ -259,7 +259,11 @@ static void set_cursor()
+ gdk_pixbuf_get_height(cursor_pixbuf)/2);
+ gdk_window_set_cursor(gc_get_window()->window, cursor);
+ gdk_cursor_unref(cursor);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(cursor_pixbuf);
++#else
++ g_object_unref(cursor_pixbuf);
++#endif
+ }
+ }
+ }
+diff -up gcompris-11.12/src/fifteen-activity/fifteen.c~ gcompris-11.12/src/fifteen-activity/fifteen.c
+--- gcompris-11.12/src/fifteen-activity/fifteen.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/fifteen-activity/fifteen.c 2012-01-02 10:38:18.782563038 +0100
+@@ -210,7 +210,11 @@ static GooCanvasItem *fifteen_create_ite
+ -1*((gdk_pixbuf_get_width(pixmap)-(4*PIECE_SIZE))/2),
+ -1*((gdk_pixbuf_get_height(pixmap)-(4*PIECE_SIZE))/2)-2,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+
+ board = g_new (GooCanvasItem *, 16);
+diff -up gcompris-11.12/src/gcompris/about.c~ gcompris-11.12/src/gcompris/about.c
+--- gcompris-11.12/src/gcompris/about.c~ 2011-12-17 17:07:53.000000000 +0100
++++ gcompris-11.12/src/gcompris/about.c 2012-01-02 10:33:03.472581567 +0100
+@@ -164,7 +164,11 @@ void gc_about_start ()
+ (gdouble) y_start - gdk_pixbuf_get_height(pixmap) + 15,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(sponsor_image);
+ }
+ else
+diff -up gcompris-11.12/src/gcompris/bonus.c~ gcompris-11.12/src/gcompris/bonus.c
+--- gcompris-11.12/src/gcompris/bonus.c~ 2011-10-03 21:49:57.000000000 +0200
++++ gcompris-11.12/src/gcompris/bonus.c 2012-01-02 10:32:57.472581938 +0100
+@@ -207,7 +207,11 @@ bonus_image(char *image, GCBonusStatusLi
+ NULL);
+ }
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ g_free(str);
+ end_bonus_id = g_timeout_add (GC_BONUS_DURATION, (GSourceFunc) end_bonus, NULL);
+diff -up gcompris-11.12/src/gcompris/gameutil.c~ gcompris-11.12/src/gcompris/gameutil.c
+--- gcompris-11.12/src/gcompris/gameutil.c~ 2011-10-03 21:49:57.000000000 +0200
++++ gcompris-11.12/src/gcompris/gameutil.c 2012-01-02 10:33:04.960581481 +0100
+@@ -770,7 +770,11 @@ gc_util_button_text(GooCanvasItem *rooti
+ "button_press_event",
+ process, data);
+ gc_item_focus_init(item_text, item);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ /** Display a button with the given text (BY SKIN'S SVG ID)
+diff -up gcompris-11.12/src/gcompris/gcompris.c~ gcompris-11.12/src/gcompris/gcompris.c
+--- gcompris-11.12/src/gcompris/gcompris.c~ 2012-01-02 10:15:25.000000000 +0100
++++ gcompris-11.12/src/gcompris/gcompris.c 2012-01-02 10:30:01.474592272 +0100
+@@ -583,7 +583,11 @@ void gc_cursor_set(guint gdk_cursor_type
+ cursor_pixbuf, 0, 0);
+ gdk_window_set_cursor(window->window, cursor);
+ gdk_cursor_unref(cursor);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(cursor_pixbuf);
++#else
++ g_object_unref(cursor_pixbuf);
++#endif
+ }
+ else
+ {
+@@ -651,7 +655,11 @@ _set_pixmap_background(GooCanvasItem *pa
+ NULL);
+ goo_canvas_item_lower(backgroundimg, NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(background_pixmap);
++#else
++ g_object_unref(background_pixmap);
++#endif
+
+ }
+
+@@ -828,7 +836,11 @@ static void setup_window ()
+ if (icon_pixbuf)
+ {
+ gtk_window_set_icon (GTK_WINDOW (window), icon_pixbuf);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref (icon_pixbuf);
++#else
++ g_object_unref (icon_pixbuf);
++#endif
+ }
+ }
+ else
+diff -up gcompris-11.12/src/gcompris/images_selector.c~ gcompris-11.12/src/gcompris/images_selector.c
+--- gcompris-11.12/src/gcompris/images_selector.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/gcompris/images_selector.c 2012-01-02 10:33:08.432581273 +0100
+@@ -371,7 +371,11 @@ display_image(gchar *imagename, GooCanva
+ NULL);
+ goo_canvas_item_translate(item, ix, iy);
+ goo_canvas_item_scale(item, xratio, xratio);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ g_signal_connect(item, "button_press_event",
+ (GCallback) item_event_images_selector,
+@@ -426,7 +430,11 @@ display_image_set(gchar *imagename, GSLi
+ NULL);
+ goo_canvas_item_translate(item, 5, isy);
+ goo_canvas_item_scale(item, xratio, xratio);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_object_set_data (G_OBJECT (item), "imagelist", imagelist);
+
+ g_signal_connect(item, "button_press_event",
+diff -up gcompris-11.12/src/gcompris/timer.c~ gcompris-11.12/src/gcompris/timer.c
+--- gcompris-11.12/src/gcompris/timer.c~ 2011-10-03 21:49:57.000000000 +0200
++++ gcompris-11.12/src/gcompris/timer.c 2012-01-02 10:33:01.936581658 +0100
+@@ -90,7 +90,11 @@ gc_timer_display(int ax, int ay,
+ y,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(filename);
+ }
+ break;
+@@ -123,7 +127,11 @@ gc_timer_display(int ax, int ay,
+ */
+ ystep = (BOARDHEIGHT-y-gdk_pixbuf_get_height(pixmap))/second;
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ pixmap = gc_skin_pixmap_load("timers/sea.png");
+ goo_canvas_image_new (boardRootItem,
+@@ -133,7 +141,11 @@ gc_timer_display(int ax, int ay,
+ "width", (double) gdk_pixbuf_get_width(pixmap),
+ "height", (double) gdk_pixbuf_get_height(pixmap),
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ break;
+ default:
+@@ -312,7 +324,11 @@ timer_increment(GooCanvasItem *item)
+ g_object_set(item,
+ "pixbuf", pixmap,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(filename);
+ }
+ break;
+diff -up gcompris-11.12/src/hanoi_real-activity/hanoi_real.c~ gcompris-11.12/src/hanoi_real-activity/hanoi_real.c
+--- gcompris-11.12/src/hanoi_real-activity/hanoi_real.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/hanoi_real-activity/hanoi_real.c 2012-01-02 10:41:17.324552552 +0100
+@@ -339,7 +339,11 @@ hanoi_create_item(GooCanvasItem *parent)
+ baseline - gdk_pixbuf_get_height(pixmap) + item_height,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+
+ for(j=0; j<number_of_item_y; j++)
+@@ -357,7 +361,11 @@ hanoi_create_item(GooCanvasItem *parent)
+ pixmap,
+ 0, 0,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ goo_canvas_item_translate(item,
+ position[i][j]->x - w/2,
+ position[i][j]->y);
+diff -up gcompris-11.12/src/imageid-activity/imageid.c~ gcompris-11.12/src/imageid-activity/imageid.c
+--- gcompris-11.12/src/imageid-activity/imageid.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/imageid-activity/imageid.c 2012-01-02 10:32:43.376582736 +0100
+@@ -315,7 +315,11 @@ imageid_create_item(GooCanvasItem *paren
+ y,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ xp = HORIZONTAL_SEPARATION;
+
+diff -up gcompris-11.12/src/leftright-activity/leftright.c~ gcompris-11.12/src/leftright-activity/leftright.c
+--- gcompris-11.12/src/leftright-activity/leftright.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/leftright-activity/leftright.c 2012-01-02 10:44:41.675540537 +0100
+@@ -259,7 +259,11 @@ static GooCanvasItem *leftright_create_i
+
+ g_free(str);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(hand_pixmap);
++#else
++ g_object_unref(hand_pixmap);
++#endif
+
+ return NULL;
+ }
+diff -up gcompris-11.12/src/magic_hat_minus-activity/magic_hat.c~ gcompris-11.12/src/magic_hat_minus-activity/magic_hat.c
+--- gcompris-11.12/src/magic_hat_minus-activity/magic_hat.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/magic_hat_minus-activity/magic_hat.c 2012-01-02 10:44:29.931541214 +0100
+@@ -312,7 +312,11 @@ static GooCanvasItem *magic_hat_create_i
+ 0.0,
+ 0.0,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // Initialisation for frame1
+ frame1.id = 1;
+@@ -507,7 +511,11 @@ static void draw_hat(GooCanvasItem *item
+ g_object_set(item,
+ "pixbuf", image,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(image);
++#else
++ g_object_unref(image);
++#endif
+
+ if (type == STARS) {
+ hat_event_id = g_signal_connect(item,
+diff -up gcompris-11.12/src/maze-activity/maze.c~ gcompris-11.12/src/maze-activity/maze.c
+--- gcompris-11.12/src/maze-activity/maze.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/maze-activity/maze.c 2012-01-02 10:44:45.131540339 +0100
+@@ -307,7 +307,11 @@ static void maze_next_level() {
+ if(pixmap)
+ {
+ draw_image(mazegroup,breedte-1,end,pixmap);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ position[ind][0]=0;
+@@ -699,7 +703,11 @@ draw_image(GooCanvasItem *group,
+ x1+buffer,
+ y1+buffer,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap2);
++#else
++ g_object_unref(pixmap2);
++#endif
+
+ return(item);
+ }
+diff -up gcompris-11.12/src/memory-activity/memory.c~ gcompris-11.12/src/memory-activity/memory.c
+--- gcompris-11.12/src/memory-activity/memory.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/memory-activity/memory.c 2012-01-02 10:32:49.968582363 +0100
+@@ -1342,7 +1342,11 @@ static void create_item(GooCanvasItem *p
+ 50,
+ 140,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap_tux);
++#else
++ g_object_unref(pixmap_tux);
++#endif
+
+ tux_score = goo_canvas_text_new (parent,
+ "",
+@@ -1393,7 +1397,11 @@ static void create_item(GooCanvasItem *p
+ goo_canvas_item_scale(memoryItem->backcardItem,
+ width2 / gdk_pixbuf_get_width(pixmap),
+ height2 / gdk_pixbuf_get_height(pixmap));
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ if (currentUiMode != UIMODE_SOUND){
+ pixmap = gc_pixmap_load("memory/emptycard.png");
+@@ -1407,7 +1415,11 @@ static void create_item(GooCanvasItem *p
+ (width2 / gdk_pixbuf_get_width(pixmap)),
+ (height2 / gdk_pixbuf_get_height(pixmap)));
+ g_object_set (memoryItem->framecardItem, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+
+@@ -1425,7 +1437,11 @@ static void create_item(GooCanvasItem *p
+ goo_canvas_item_scale(memoryItem->frontcardItem,
+ (width2 / gdk_pixbuf_get_width(pixmap)),
+ (height2 / gdk_pixbuf_get_height(pixmap)));
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+ else {
+
+@@ -1452,7 +1468,11 @@ static void create_item(GooCanvasItem *p
+ (width2 - gdk_pixbuf_get_width(pixmap))/2,
+ (height2 - gdk_pixbuf_get_height(pixmap))/2);
+ }
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ } else {
+ gchar *font;
+diff -up gcompris-11.12/src/missing_letter-activity/missingletter.c~ gcompris-11.12/src/missing_letter-activity/missingletter.c
+--- gcompris-11.12/src/missing_letter-activity/missingletter.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/missing_letter-activity/missingletter.c 2012-01-02 10:32:44.960582650 +0100
+@@ -329,7 +329,11 @@ missing_letter_create_item(GooCanvasItem
+ img_area_x+(img_area_w - gdk_pixbuf_get_width(pixmap))/2,
+ img_area_y+(img_area_h - gdk_pixbuf_get_height(pixmap))/2,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ /* Calc the number of proposals */
+ i = 0;
+@@ -402,7 +406,11 @@ missing_letter_create_item(GooCanvasItem
+ i++;
+ }
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(button_pixmap);
++#else
++ g_object_unref(button_pixmap);
++#endif
+ }
+
+ /* ==================================== */
+@@ -494,7 +502,11 @@ highlight_selected(GooCanvasItem * butto
+ {
+ button_pixmap = gc_pixmap_load("missing_letter/button.png");
+ g_object_set(selected_button, "pixbuf", button_pixmap, NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(button_pixmap);
++#else
++ g_object_unref(button_pixmap);
++#endif
+ }
+
+ if (selected_button != button)
+@@ -502,7 +514,11 @@ highlight_selected(GooCanvasItem * butto
+ button_pixmap_selected = gc_pixmap_load("missing_letter/button_selected.png");
+ g_object_set(button, "pixbuf", button_pixmap_selected, NULL);
+ selected_button = button;
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(button_pixmap_selected);
++#else
++ g_object_unref(button_pixmap_selected);
++#endif
+ }
+ }
+
+diff -up gcompris-11.12/src/money-activity/money.c~ gcompris-11.12/src/money-activity/money.c
+--- gcompris-11.12/src/money-activity/money.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/money-activity/money.c 2012-01-02 10:32:52.960582192 +0100
+@@ -908,7 +908,11 @@ static void display_paying_tux(guint not
+ 20,
+ 130,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ if (note == 30)
+ {
+diff -up gcompris-11.12/src/photohunter-activity/photohunter.c~ gcompris-11.12/src/photohunter-activity/photohunter.c
+--- gcompris-11.12/src/photohunter-activity/photohunter.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/photohunter-activity/photohunter.c 2012-01-02 10:44:39.051540691 +0100
+@@ -528,8 +528,13 @@ static void StartLevel( )
+
+ search_diffs(pixmap[0], pixmap[1]);
+
+- for( ScanPhoto=0; ScanPhoto<2; ScanPhoto++ )
++ for( ScanPhoto=0; ScanPhoto<2; ScanPhoto++ ) {
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap[ScanPhoto]);
++#else
++ g_object_unref(pixmap[ScanPhoto]);
++#endif
++ }
+
+ g_free(RandomFileToLoad);
+
+diff -up gcompris-11.12/src/railroad-activity/railroad.c~ gcompris-11.12/src/railroad-activity/railroad.c
+--- gcompris-11.12/src/railroad-activity/railroad.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/railroad-activity/railroad.c 2012-01-02 10:43:07.644546046 +0100
+@@ -205,13 +205,21 @@ static void end_board ()
+ while(g_list_length(listPixmapEngines)>0) {
+ pixmap = g_list_nth_data(listPixmapEngines, 0);
+ listPixmapEngines = g_list_remove (listPixmapEngines, pixmap);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ while(g_list_length(listPixmapWagons)>0) {
+ pixmap = g_list_nth_data(listPixmapWagons, 0);
+ listPixmapWagons = g_list_remove (listPixmapWagons, pixmap);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ }
+diff -up gcompris-11.12/src/reversecount-activity/reversecount.c~ gcompris-11.12/src/reversecount-activity/reversecount.c
+--- gcompris-11.12/src/reversecount-activity/reversecount.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/reversecount-activity/reversecount.c 2012-01-02 10:34:35.087576172 +0100
+@@ -649,7 +649,11 @@ display_item_at(gchar *imagename, int bl
+ gdk_pixbuf_get_width (pixmap) * xratio,
+ gdk_pixbuf_get_height(pixmap) * xratio,
+ GDK_INTERP_BILINEAR);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ item = goo_canvas_image_new (boardRootItem,
+ pixmap2,
+@@ -659,7 +663,11 @@ display_item_at(gchar *imagename, int bl
+ (gdk_pixbuf_get_height (pixmap2))) / 2,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap2);
++#else
++ g_object_unref(pixmap2);
++#endif
+
+ return(item);
+ }
+@@ -810,7 +818,11 @@ static void create_clock(double x, doubl
+ y,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(str);
+ }
+
+@@ -830,7 +842,11 @@ static void update_clock(int value)
+ "pixbuf", pixmap,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(str);
+ }
+
+diff -up gcompris-11.12/src/scalesboard-activity/scale.c~ gcompris-11.12/src/scalesboard-activity/scale.c
+--- gcompris-11.12/src/scalesboard-activity/scale.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/scalesboard-activity/scale.c 2012-01-02 10:32:56.416581985 +0100
+@@ -636,7 +636,11 @@ scale_list_add_weight(GooCanvasItem *gro
+ goo_canvas_item_translate(new_item->item,
+ new_item->x,
+ new_item->y);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_free(weight_text);
+
+ gc_item_focus_init(new_item->item, NULL);
+@@ -801,7 +805,11 @@ scale_prepare_level()
+
+ pixmap = gc_pixmap_load(imageList[g_random_int_range(0,imageListCount)]);
+ scale_list_add_object(group_d, pixmap, objet_weight, -1, show_weight);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ // Defines a set of available weight-items and possible values for the "unknown" object
+@@ -914,7 +922,11 @@ static void scale_prepare_level_weight()
+
+ pixmap = gc_pixmap_load(imageList[g_random_int_range(0,imageListCount)]);
+ scale_list_add_object(group_d, pixmap, objet_weight,-1, show_weight_objet);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ static void
+@@ -946,14 +958,22 @@ scale_next_level()
+ BOARDWIDTH/2 - gdk_pixbuf_get_width(pixmap2)/2,
+ balance_left_y - 10,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap2);
++#else
++ g_object_unref(pixmap2);
++#endif
+
+ goo_canvas_image_new(boardRootItem,
+ pixmap,
+ balance_x,
+ balance_left_y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ /* Set a sign on the scale in case it's not easy to determine
+ on which side it balances */
+@@ -982,7 +1002,11 @@ scale_next_level()
+ 0,
+ PLATE_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ /* create right plate */
+ group_d = goo_canvas_group_new(boardRootItem, NULL);
+@@ -998,8 +1022,13 @@ scale_next_level()
+ 0,
+ PLATE_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
+ gdk_pixbuf_unref(pixmap2);
++#else
++ g_object_unref(pixmap);
++ g_object_unref(pixmap2);
++#endif
+
+ /* display some hint */
+ if(gcomprisBoard->level > 2 || board_mode == MODE_WEIGHT)
+diff -up gcompris-11.12/src/submarine-activity/submarine.c~ gcompris-11.12/src/submarine-activity/submarine.c
+--- gcompris-11.12/src/submarine-activity/submarine.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/submarine-activity/submarine.c 2012-01-02 10:33:09.952581203 +0100
+@@ -397,7 +397,11 @@ static GooCanvasItem *submarine_drawback
+ goo_canvas_image_new (backgroundRootItem, pixmap,
+ schema_x, schema_y, NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ #define COMMAND_OFFSET 20.0
+ pixmap = gc_pixmap_load("submarine/up.png");
+@@ -427,7 +431,11 @@ static GooCanvasItem *submarine_drawback
+ g_signal_connect(item, "button-press-event",
+ (GCallback) engine_event, GINT_TO_POINTER(UP));
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ pixmap = gc_pixmap_load("submarine/down.png");
+ item = goo_canvas_image_new (backgroundRootItem,
+@@ -454,7 +462,11 @@ static GooCanvasItem *submarine_drawback
+ g_signal_connect(item, "button-press-event",
+ (GCallback) engine_event, GINT_TO_POINTER(DOWN));
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ return backgroundRootItem;
+ }
+@@ -479,7 +491,11 @@ static GooCanvasItem *submarine_create_i
+ 0,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+
+ pixmap = gc_pixmap_load("submarine/vanne.svg");
+@@ -531,7 +547,11 @@ static GooCanvasItem *submarine_create_i
+ g_signal_connect(regleur_chasse_item, "button-press-event",
+ (GCallback) regleur_chasse_event, NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // DEPTH RUDDERS
+ pixmap = gc_pixmap_load("submarine/rudder.png");
+@@ -545,7 +565,11 @@ static GooCanvasItem *submarine_create_i
+ schema_x + BARRE_AR_X,
+ schema_y + BARRE_AR_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // displays the speed on the engine
+ sprintf(s12,"%d",(int)submarine_horizontal_speed);
+@@ -716,7 +740,11 @@ static GooCanvasItem *submarine_create_i
+ ALERT_SUBMARINE_X,
+ ALERT_SUBMARINE_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_object_set (alert_submarine,
+ "visibility", GOO_CANVAS_ITEM_INVISIBLE,
+ NULL);
+@@ -734,7 +762,11 @@ static GooCanvasItem *submarine_create_i
+ "visibility", GOO_CANVAS_ITEM_INVISIBLE,
+ NULL);
+ }
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // whale item
+ switch(gcomprisBoard->level)
+@@ -763,7 +795,11 @@ static GooCanvasItem *submarine_create_i
+ whale_x,
+ whale_y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // whale being hit
+ pixmap = gc_pixmap_load("submarine/whale_hit.png");
+@@ -776,7 +812,11 @@ static GooCanvasItem *submarine_create_i
+ "visibility", GOO_CANVAS_ITEM_INVISIBLE,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // treasure item
+ pixmap = gc_pixmap_load("submarine/crown.png");
+@@ -797,7 +837,11 @@ static GooCanvasItem *submarine_create_i
+ 6*1000,
+ 40,
+ GOO_CANVAS_ANIMATE_FREEZE);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ // the triggers for air compressor and battery charger
+ pixmap = gc_pixmap_load("submarine/manette.png");
+@@ -811,7 +855,11 @@ static GooCanvasItem *submarine_create_i
+ schema_x + BATTERY_TRIGGER_X,
+ schema_y + BATTERY_TRIGGER_Y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ g_signal_connect(air_compressor_item, "button-press-event",
+ (GCallback) air_compressor_event, NULL);
+@@ -895,7 +943,11 @@ static void start_frigate_anim()
+ 100*1000,
+ 100,
+ GOO_CANVAS_ANIMATE_RESTART);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ }
+
+ static void stop_frigate_anim()
+@@ -1663,7 +1715,11 @@ static void submarine_explosion()
+ g_object_set(submarine_item,
+ "pixbuf", pixmap,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+
+ ok();
+ }
+diff -up gcompris-11.12/src/tangram-activity/gtans_interface.c~ gcompris-11.12/src/tangram-activity/gtans_interface.c
+--- gcompris-11.12/src/tangram-activity/gtans_interface.c~ 2011-10-03 21:49:57.000000000 +0200
++++ gcompris-11.12/src/tangram-activity/gtans_interface.c 2012-01-02 10:44:23.147541584 +0100
+@@ -190,8 +190,13 @@ void create_mainwindow (GooCanvasItem *r
+ NULL);
+
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(right_rot);
+ gdk_pixbuf_unref(left_rot);
++#else
++ g_object_unref(right_rot);
++ g_object_unref(left_rot);
++#endif
+
+ right_rot_big = gc_pixmap_load("tangram/gtans_2x-rotate.png");
+ left_rot_big = gc_pixmap_load("tangram/gtans_2x-rotate-left.png");
+@@ -209,8 +214,13 @@ void create_mainwindow (GooCanvasItem *r
+ Y_BASE_SMALLAREA + WIDTH_SMALLAREA + 120,
+ NULL);
+
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(right_rot_big);
+ gdk_pixbuf_unref(left_rot_big);
++#else
++ g_object_unref(right_rot_big);
++ g_object_unref(left_rot_big);
++#endif
+
+
+ g_signal_connect(r_rot_s, "button_press_event",
+diff -up gcompris-11.12/src/wordprocessor-activity/wordprocessor.c~ gcompris-11.12/src/wordprocessor-activity/wordprocessor.c
+--- gcompris-11.12/src/wordprocessor-activity/wordprocessor.c~ 2011-12-12 22:53:55.000000000 +0100
++++ gcompris-11.12/src/wordprocessor-activity/wordprocessor.c 2012-01-02 10:41:37.932551302 +0100
+@@ -364,7 +364,11 @@ static GooCanvasItem *wordprocessor_crea
+ 17.0,
+ y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_signal_connect(item, "button_press_event",
+ (GCallback) save_event, buffer);
+ gc_item_focus_init(item, NULL);
+@@ -380,7 +384,11 @@ static GooCanvasItem *wordprocessor_crea
+ 60.0,
+ y,
+ NULL);
++#if GDK_PIXBUF_MAJOR <= 2 && GDK_PIXBUF_MINOR <= 24
+ gdk_pixbuf_unref(pixmap);
++#else
++ g_object_unref(pixmap);
++#endif
+ g_signal_connect(item, "button_press_event",
+ (GCallback) load_event, buffer);
+ gc_item_focus_init(item, NULL);
diff --git a/gcompris.spec b/gcompris.spec
index 6d7ebe9..3f1870c 100644
--- a/gcompris.spec
+++ b/gcompris.spec
@@ -7,6 +7,7 @@ License: GPLv3+
URL: http://gcompris.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: gcompris-9.0-icon.patch
+Patch1: gcompris-11.12-deprecated.patch
Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel
Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
Buildrequires: gnome-python2 xorg-x11-proto-devel gstreamer-devel
@@ -293,6 +294,7 @@ Voice samples for the GCompris games in Turk.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
for file in docs/C/%{name}.info AUTHORS ChangeLog; do
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
touch -r $file $file.new && \
More information about the scm-commits
mailing list