gnome-settings-daemon r444 - in trunk: . plugins/xrandr

[federico svn gnome org]

Author: federico
Date: Sat Aug 16 01:55:48 2008
New Revision: 444
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=444&view=rev

Log:
xrandr - Create the RANDR configuration before the tray icon's menu items
2008-08-13  Federico Mena Quintero  <federico novell com>

	* plugins/xrandr/gsd-xrandr-manager.c (status_icon_popup_menu):
	Create the RANDR configuration and labeler before the menu items.

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


Modified:
   trunk/ChangeLog
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Sat Aug 16 01:55:48 2008
@@ -213,6 +213,12 @@
         GtkWidget *menu;
         GtkWidget *item;
 
+        g_assert (priv->configuration == NULL);
+        priv->configuration = gnome_rr_config_new_current (priv->rw_screen);
+
+        g_assert (priv->labeler == NULL);
+        priv->labeler = gnome_rr_labeler_new (priv->configuration);
+
         g_assert (priv->popup_menu == NULL);
         priv->popup_menu = gtk_menu_new ();
 
@@ -234,12 +240,6 @@
         g_signal_connect (priv->popup_menu, "selection-done",
                           G_CALLBACK (status_icon_popup_menu_selection_done_cb), manager);
 
-        g_assert (priv->configuration == NULL);
-        priv->configuration = gnome_rr_config_new_current (priv->rw_screen);
-
-        g_assert (priv->labeler == NULL);
-        priv->labeler = gnome_rr_labeler_new (priv->configuration);
-
         gtk_menu_popup (GTK_MENU (priv->popup_menu), NULL, NULL,
                         gtk_status_icon_position_menu,
                         priv->status_icon, button, timestamp);