gnome-panel r11185 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Mon Aug  4 02:12:54 2008
New Revision: 11185
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11185&view=rev

Log:
2008-08-04  Vincent Untz  <vuntz gnome org>

	* panel-menu-items.c: (panel_menu_items_append_lock_logout): don't show
	logout/shutdown if it's locked down. Remove extra separator that got
	added when screensaver is locked down.
	End of bug #522453.


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-menu-items.c

Modified: trunk/gnome-panel/panel-menu-items.c
==============================================================================
--- trunk/gnome-panel/panel-menu-items.c	(original)
+++ trunk/gnome-panel/panel-menu-items.c	Mon Aug  4 02:12:54 2008
@@ -1461,6 +1461,10 @@
 		}
 	}
 
+	if (panel_lockdown_get_disable_log_out ())
+		return;
+	/* Below this, we only have log out/shutdown items */
+
 	/* Translators: translate "panel:showusername|1" to anything
 	 * but "1" if "Log Out %s" doesn't make any sense in your
 	 * language (where %s is a username).
@@ -1495,8 +1499,10 @@
 	g_free (tooltip);
 
 	if (item != NULL) {
-		if (!separator_inserted)
+		if (!separator_inserted) {
 			add_menu_separator (menu);
+			separator_inserted = TRUE;
+		}
 
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}