[gnome-panel] panel: Rearrange user menu order to match GNOME Shell 3.6



commit a0a3ecd32edf7a2ffeeb2d67bfe2df70086e436c
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Sep 8 22:44:05 2012 -0400

    panel: Rearrange user menu order to match GNOME Shell 3.6
    
    Switch User, Log Out, Lock is the new order
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683650

 gnome-panel/panel-menu-items.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gnome-panel/panel-menu-items.c b/gnome-panel/panel-menu-items.c
index 1364b69..ba1bd20 100644
--- a/gnome-panel/panel-menu-items.c
+++ b/gnome-panel/panel-menu-items.c
@@ -1848,35 +1848,35 @@ panel_menu_items_append_lock_logout (GtkWidget *menu)
 	panel_menu_items_lock_logout_separator_notified (panel_lockdown_get (),
 							 item);
 
-	item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOCK,
-							 NULL, NULL, TRUE);
+	item = panel_menu_items_create_switch_user (FALSE);
+
 	if (item != NULL) {
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 		g_object_bind_property (panel_lockdown_get (),
-					"disable-lock-screen",
+					"disable-switch-user",
 					item,
 					"visible",
 					G_BINDING_SYNC_CREATE|G_BINDING_INVERT_BOOLEAN);
 	}
 
-	item = panel_menu_items_create_switch_user (FALSE);
+	item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT,
+							 NULL, NULL, TRUE);
 
 	if (item != NULL) {
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 		g_object_bind_property (panel_lockdown_get (),
-					"disable-switch-user",
+					"disable-log-out",
 					item,
 					"visible",
 					G_BINDING_SYNC_CREATE|G_BINDING_INVERT_BOOLEAN);
 	}
 
-	item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT,
+	item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOCK,
 							 NULL, NULL, TRUE);
-
 	if (item != NULL) {
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 		g_object_bind_property (panel_lockdown_get (),
-					"disable-log-out",
+					"disable-lock-screen",
 					item,
 					"visible",
 					G_BINDING_SYNC_CREATE|G_BINDING_INVERT_BOOLEAN);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]