rpms/gnome-settings-daemon/devel composited-changed.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.104, 1.105

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3776

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	composited-changed.patch 
Log Message:
Make the 'locate pointer' effect robust against compositing manager changes


composited-changed.patch:

--- NEW FILE composited-changed.patch ---
--- gnome-settings-daemon-2.27.1/plugins/mouse/gsd-locate-pointer.c	2009-05-03 14:15:30.000000000 -0400
+++ hacked/plugins/mouse/gsd-locate-pointer.c	2009-06-08 21:54:05.537099156 -0400
@@ -195,6 +195,22 @@
 }
 
 static void
+unset_transparent_shape (GdkWindow *window)
+{
+  gdk_window_shape_combine_mask (data->window, NULL, 0, 0);
+}
+
+static void
+composited_changed (GtkWidget            *widget,
+                    GsdLocatePointerData *data)
+{
+  if (!gtk_widget_is_composited (widget))
+    set_transparent_shape (data->window);
+  else
+    unset_transparent_shape (data->window);
+}
+
+static void
 timeline_finished_cb (GsdTimeline *timeline,
 		      gpointer     user_data)
 {
@@ -317,8 +333,10 @@
 
   data->progress = 0.;
 
-  if (!gtk_widget_is_composited (data->widget))
-    set_transparent_shape (data->window);
+  g_signal_connect (data->widget, "composited-changed",
+                    G_CALLBACK (composited_changed), data);
+
+  composited_changed (data->widget, data);
 
   gdk_window_show (data->window);
   move_locate_pointer_window (data, screen);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gnome-settings-daemon.spec	16 May 2009 05:14:59 -0000	1.104
+++ gnome-settings-daemon.spec	9 Jun 2009 02:03:50 -0000	1.105
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -38,6 +38,9 @@ Patch11:	gnome-settings-daemon-2.26.0-su
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=585209
+Patch13:	composited-changed.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -58,6 +61,7 @@ developing applications that use %{name}
 
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
+%patch13 -p1 -b .composited-changed
 
 autoreconf -i -f
 
@@ -170,6 +174,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Jun  8 2009 Matthias Clasen <mclasen at redhat.com> 2.27.1-2
+- Make the 'locate pointer' effect cope with changing compositing
+  managers
+
 * Sat May 16 2009 Matthias Clasen <mclasen at redhat.com> 2.27.1-1
 - Update to 2.27.1