gnome-settings-daemon r359 - in branches/randr-12: . plugins/xrandr

[federico svn gnome org]

Author: federico
Date: Fri May 30 18:00:50 2008
New Revision: 359
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=359&view=rev

Log:
xrandr - Actually show the popup menu
2008-05-30  Federico Mena Quintero  <federico novell com>

	* plugins/xrandr/gsd-xrandr-manager.c (status_icon_popup_menu):
	Actually pop up the menu!  Destroy the menu when it deactivates.

Signed-off-by: Federico Mena Quintero <federico novell com>


Modified:
   branches/randr-12/ChangeLog
   branches/randr-12/plugins/xrandr/gsd-xrandr-manager.c

Modified: branches/randr-12/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- branches/randr-12/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ branches/randr-12/plugins/xrandr/gsd-xrandr-manager.c	Fri May 30 18:00:50 2008
@@ -184,6 +184,7 @@
 static void
 status_icon_popup_menu (GsdXrandrManager *manager, guint button, guint32 timestamp)
 {
+        struct GsdXrandrManagerPrivate *priv = manager->priv;
         GtkWidget *menu;
         GtkWidget *item;
 
@@ -201,7 +202,9 @@
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
         /* FIXME */
 
-        /* FIXME: the menu should get destroyed after a command gets activated */
+        g_signal_connect (menu, "deactivate",
+                          G_CALLBACK (gtk_widget_destroy), NULL);
+        gtk_menu_popup (menu, NULL, NULL, gtk_status_icon_position_menu, priv->status_icon, button, timestamp);
 }
 
 static void