From 3942e8d0c73045165de44d1af4d3ef2f4ed87f0a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Mar 30 2007 17:01:25 +0000
Subject: - hide "Lock Screen" menu item when logged in as root


---

diff --git a/gnome-panel-2.18.0-hide-menu-if-root.patch b/gnome-panel-2.18.0-hide-menu-if-root.patch
new file mode 100644
index 0000000..82a403a
--- /dev/null
+++ b/gnome-panel-2.18.0-hide-menu-if-root.patch
@@ -0,0 +1,15 @@
+--- gnome-panel-2.18.0/gnome-panel/panel-util.c.hide-menu-if-root	2007-03-30 12:35:38.000000000 -0400
++++ gnome-panel-2.18.0/gnome-panel/panel-util.c	2007-03-30 12:39:28.000000000 -0400
+@@ -780,6 +780,12 @@
+ 
+ 	g_return_val_if_fail (action != NULL, FALSE);
+ 
++        /* Neither gnome-screensaver or xscreensaver allow root
++         * to lock the screen
++         */
++        if ((strcmp (action, "lock") == 0) && (geteuid () == 0))
++          return FALSE;
++       
+ 	command = panel_lock_screen_action_get_command (action);
+ 	if (command)
+ 		enabled = TRUE;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3d5c00c..801d756 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.18.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -95,6 +95,9 @@ Patch15: gnome-panel-2.16.0-compiz-support.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=395416
 Patch17: gnome-panel-xdg-user-dirs.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=424545
+Patch18: gnome-panel-2.18.0-hide-menu-if-root.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -307,6 +310,9 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Mar 30 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-2
+- hide "Lock Screen" menu item when logged in as root
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-1
 - Update to 2.18.0