[gcompris] Fix for GTK deprecated/removed methods

[Johan Cwiklinski]

commit bb613f8822ccf1e74ebde60af98ccdc5c2d38a6f
Author: trasher <trasher at fedoraproject.org>
Date:   Sat Jul 31 13:57:59 2010 +0200

    Fix for GTK deprecated/removed methods

 gcompris-9.3_gtk.patch |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 gcompris.spec          |    7 ++++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/gcompris-9.3_gtk.patch b/gcompris-9.3_gtk.patch
new file mode 100644
index 0000000..aa45c2a
--- /dev/null
+++ b/gcompris-9.3_gtk.patch
@@ -0,0 +1,48 @@
+diff -up gcompris-9.3/src/goocanvas/src/goocanvas.c.patch gcompris-9.3/src/goocanvas/src/goocanvas.c
+--- gcompris-9.3/src/goocanvas/src/goocanvas.c.patch	2010-07-31 10:19:26.478344975 +0200
++++ gcompris-9.3/src/goocanvas/src/goocanvas.c	2010-07-31 10:19:38.343342977 +0200
+@@ -478,7 +478,7 @@ goo_canvas_init (GooCanvas *canvas)
+ 
+   /* We set GTK_CAN_FOCUS by default, so it works as people expect.
+      Though developers can turn this off if not needed for efficiency. */
+-  GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
++  gtk_widget_set_can_focus(GTK_WIDGET(canvas), TRUE);
+ 
+   canvas->scale_x = 1.0;
+   canvas->scale_y = 1.0;
+@@ -1454,7 +1454,7 @@ goo_canvas_realize (GtkWidget *widget)
+ 
+   canvas = GOO_CANVAS (widget);
+   priv = GOO_CANVAS_GET_PRIVATE (canvas);
+-  GTK_WIDGET_SET_FLAGS (canvas, GTK_REALIZED);
++  gtk_widget_set_realized(GTK_WIDGET(canvas), TRUE);
+ 
+   attributes.window_type = GDK_WINDOW_CHILD;
+   attributes.x = widget->allocation.x;
+@@ -1566,7 +1566,7 @@ goo_canvas_map (GtkWidget *widget)
+ 
+   canvas = GOO_CANVAS (widget);
+ 
+-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
++  gtk_widget_set_mapped(GTK_WIDGET(widget), TRUE);
+ 
+   tmp_list = canvas->widget_items;
+   while (tmp_list)
+@@ -3258,7 +3258,7 @@ goo_canvas_focus_in        (GtkWidget   
+ {
+   GooCanvas *canvas = GOO_CANVAS (widget);
+ 
+-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
++  gtk_widget_has_focus(GTK_WIDGET(widget));
+ 
+   if (canvas->focused_item)
+     return propagate_event (canvas, canvas->focused_item,
+@@ -3274,7 +3274,7 @@ goo_canvas_focus_out       (GtkWidget   
+ {
+   GooCanvas *canvas = GOO_CANVAS (widget);
+ 
+-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
++  gtk_widget_set_can_focus(GTK_WIDGET(widget), FALSE);
+ 
+   if (canvas->focused_item)
+     return propagate_event (canvas, canvas->focused_item,
diff --git a/gcompris.spec b/gcompris.spec
index 526367a..6db6615 100644
--- a/gcompris.spec
+++ b/gcompris.spec
@@ -1,12 +1,13 @@
 Name:           gcompris
 Version:        9.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-9.0-icon.patch
+Patch1:         gcompris-9.3_gtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -280,6 +281,7 @@ GCompris development files
 %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 && \
@@ -537,6 +539,9 @@ fi
 
 
 %changelog
+* Sat Jul 31 2010 Johan Cwiklinski <johan AT x-tnd DOT be> - 9.3-3
+- Fix GTK build error
+
 * Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild