Hello community, here is the log from the commit of package gnome-main-menu checked in at Tue Nov 6 22:22:48 CET 2007. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2007-10-11 16:39:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2007-11-06 00:45:07.026462000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 6 00:43:48 CET 2007 - sreeves@suse.de + +- Dont show lock screen option when logged in as root - BNC #136622 + +------------------------------------------------------------------- New: ---- gnome-main-menu-BNC136622.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.I15784/_old 2007-11-06 22:14:52.000000000 +0100 +++ /var/tmp/diff_new_pack.I15784/_new 2007-11-06 22:14:52.000000000 +0100 @@ -19,11 +19,12 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.8 -Release: 101 +Release: 120 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.gz Source1: system-items-opensuse.xbel Patch: gnome-main-menu-misplaced-system-desktop-files.patch +Patch1: gnome-main-menu-BNC136622.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools libssui @@ -77,6 +78,7 @@ %prep %setup -n gnome-main-menu-%{version} %patch -p1 +%patch1 -p0 cp -f %{S:1} main-menu/etc/system-items.xbel %build @@ -146,6 +148,8 @@ %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.so %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la %changelog +* Tue Nov 06 2007 - sreeves@suse.de +- Dont show lock screen option when logged in as root - BNC #136622 * Thu Oct 11 2007 - sbrabec@suse.cz - Removed bogus dependency on mDNSResponder. * Tue Oct 02 2007 - jimmyk@suse.de ++++++ gnome-main-menu-BNC136622.patch ++++++ Index: main-menu/src/main-menu-ui.c =================================================================== --- main-menu/src/main-menu-ui.c (revision 364) +++ main-menu/src/main-menu-ui.c (working copy) @@ -1093,7 +1093,9 @@ return TRUE; disable_lockscreen = GPOINTER_TO_INT (libslab_get_gconf_value (DISABLE_LOCKSCREEN_GCONF_KEY)); - blacklisted = disable_lockscreen && libslab_desktop_item_is_lockscreen (uri); + /* Dont allow lock screen if root - same as gnome-panel */ + blacklisted = libslab_desktop_item_is_lockscreen (uri) && + ( (geteuid () == 0) || disable_lockscreen ); if (blacklisted) return TRUE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org