rpms/gcompris/devel gcompris-9.0-gtk_deprecated.patch, NONE, 1.1 gcompris.spec, 1.51, 1.52

[Johan Cwiklinski]

Author: trasher

Update of /cvs/pkgs/rpms/gcompris/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24858

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-9.0-gtk_deprecated.patch 
Log Message:
Fix for deprecated gtk functions since gtk-2.19.3

gcompris-9.0-gtk_deprecated.patch:
 goocanvas.c    |    4 ++--
 goocanvasatk.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gcompris-9.0-gtk_deprecated.patch ---
diff -up gcompris-9.0/src/goocanvas/src/goocanvasatk.c.patch gcompris-9.0/src/goocanvas/src/goocanvasatk.c
--- gcompris-9.0/src/goocanvas/src/goocanvasatk.c.patch	2010-01-17 11:47:01.000000000 +0100
+++ gcompris-9.0/src/goocanvas/src/goocanvasatk.c	2010-01-17 11:44:50.000000000 +0100
@@ -222,7 +222,7 @@ goo_canvas_item_accessible_grab_focus (A
   goo_canvas_grab_focus (canvas, item);
 
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (canvas));
-  if (GTK_WIDGET_TOPLEVEL (toplevel))
+  if(gtk_widget_is_toplevel(toplevel))
     gtk_window_present (GTK_WINDOW (toplevel));
 
   return TRUE;
@@ -414,7 +414,7 @@ goo_canvas_item_accessible_ref_state_set
 
   g_object_get (item, "can-focus", &can_focus, NULL);
 
-  if (GTK_WIDGET_CAN_FOCUS (GTK_WIDGET (canvas)) && can_focus)
+  if (gtk_widget_get_can_focus (GTK_WIDGET (canvas)) && can_focus)
     {
       atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
 
diff -up gcompris-9.0/src/goocanvas/src/goocanvas.c.patch gcompris-9.0/src/goocanvas/src/goocanvas.c
--- gcompris-9.0/src/goocanvas/src/goocanvas.c.patch	2010-01-17 11:47:26.000000000 +0100
+++ gcompris-9.0/src/goocanvas/src/goocanvas.c	2010-01-17 11:49:49.000000000 +0100
@@ -3314,7 +3314,7 @@ goo_canvas_grab_focus (GooCanvas     *ca
 
   g_return_if_fail (GOO_IS_CANVAS (canvas));
   g_return_if_fail (GOO_IS_CANVAS_ITEM (item));
-  g_return_if_fail (GTK_WIDGET_CAN_FOCUS (canvas));
+  g_return_if_fail (gtk_widget_get_can_focus (GTK_WIDGET (canvas)));
 
   if (canvas->focused_item) {
     event.type = GDK_FOCUS_CHANGE;
@@ -4145,7 +4145,7 @@ goo_canvas_focus (GtkWidget        *widg
   canvas = GOO_CANVAS (widget);
 
   /* If keyboard navigation has been turned off for the canvas, return FALSE.*/
-  if (!GTK_WIDGET_CAN_FOCUS (canvas))
+  if (!gtk_widget_get_can_focus (GTK_WIDGET (canvas)))
     return FALSE;
 
   /* If a child widget has the focus, try moving the focus within that. */


Index: gcompris.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gcompris.spec	17 Jan 2010 09:09:52 -0000	1.51
+++ gcompris.spec	17 Jan 2010 11:55:28 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -12,6 +12,8 @@ Patch0:         gcompris-9.0-icon.patch
 Patch1:         gcompris-9.0-photohunter.patch
 #Fix for orvelaping dice in smallnumbers activity (https://bugzilla.gnome.org/show_bug.cgi?id=607176)
 Patch2:         gcompris-9.0-smallnumbers_overlap.patch
+#Fix for deprecated gtk 2.19.3 functions (https://bugzilla.gnome.org/show_bug.cgi?id=607215)
+Patch3:         gcompris-9.0-gtk_deprecated.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
@@ -289,6 +291,7 @@ GCompris development files
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -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 && \
@@ -546,6 +549,9 @@ fi
 
 
 %changelog
+* Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-5
+- Fix for deprecated gtk functions
+
 * Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-4
 - Remove python-sqlite2 requires (part of python since 2.5, bug #480426)
 - Fix overlaping dice in smallnumber activity