rpms/gtk2/devel set-cursor.patch,NONE,1.1 gtk2.spec,1.393,1.394

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	set-cursor.patch 
Log Message:
fix setting root cursors


set-cursor.patch:
 gdkwindow.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE set-cursor.patch ---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0b8b84b..90ebfc5 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7108,7 +7108,10 @@ gdk_window_set_cursor (GdkWindow *window,
       if (cursor)
 	private->cursor = gdk_cursor_ref (cursor);
 
-      if (_gdk_window_event_parent_of (window, display->pointer_info.window_under_pointer))
+      if (private->window_type == GDK_WINDOW_ROOT ||
+          private->window_type == GDK_WINDOW_FOREIGN)
+        GDK_WINDOW_IMPL_GET_IFACE (private->impl)->set_cursor (window, cursor);
+      else if (_gdk_window_event_parent_of (window, display->pointer_info.window_under_pointer))
 	update_cursor (display);
 
       g_object_notify (G_OBJECT (window), "cursor");


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- gtk2.spec	7 Aug 2009 05:34:22 -0000	1.393
+++ gtk2.spec	11 Aug 2009 18:18:11 -0000	1.394
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch1: default_printer.patch
 
 Patch2: gdm-background.patch
+Patch3: set-cursor.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -144,6 +145,7 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch1 -p0 -b .default-printer
 %patch2 -p1 -b .gdm-background
+%patch3 -p1 -b .set-cursor
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -388,6 +390,9 @@ fi
 
 
 %changelog
+* Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-6
+- Fix setting root cursors
+
 * Fri Aug  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.6-5
 - Fix gdm background drawing