gnome-settings-daemon r546 - in branches/gnome-2-24: . plugins/xrandr

[jensg svn gnome org]

Author: jensg
Date: Sat Oct  4 10:23:29 2008
New Revision: 546
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=546&view=rev

Log:
2008-10-04  Jens Granseuer  <jensgr gmx net>

	Merged from trunk.

	Patch by: Eric Piel <e a b piel tudelft nl>

	* plugins/xrandr/gsd-xrandr-manager.c:
	(output_rotation_item_activate_cb): ignore the "activate" signal for
	deselected items so that the rotation setting doesn't reset when the
	systray menu is opened (bug #554951)


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/plugins/xrandr/gsd-xrandr-manager.c

Modified: branches/gnome-2-24/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- branches/gnome-2-24/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ branches/gnome-2-24/plugins/xrandr/gsd-xrandr-manager.c	Sat Oct  4 10:23:29 2008
@@ -437,7 +437,7 @@
 }
 
 static void
-output_rotation_item_activate_cb (GtkMenuItem *item, gpointer data)
+output_rotation_item_activate_cb (GtkCheckMenuItem *item, gpointer data)
 {
         GsdXrandrManager *manager = GSD_XRANDR_MANAGER (data);
         struct GsdXrandrManagerPrivate *priv = manager->priv;
@@ -445,6 +445,10 @@
         GnomeRRRotation rotation;
         GError *error;
 
+	/* Not interested in deselected items */
+	if (!gtk_check_menu_item_get_active (item))
+		return;
+
         output = g_object_get_data (G_OBJECT (item), "output");
         rotation = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "rotation"));