[gnome-panel] [panel] Use /desktop/gnome/lockdown/disable_lock_screen

[Vincent Untz <vuntz src gnome org>]

commit d998b8ae32fc8a7b6afc7b9fe46d954b1170a5d9
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Aug 12 11:43:04 2009 +0200

    [panel] Use /desktop/gnome/lockdown/disable_lock_screen
    
    We were using a panel-specific key that was ignored by
    gnome-screensaver.
    
    http://bugzilla.gnome.org/show_bug.cgi?id=317609

 gnome-panel/panel-global.schemas.in |    8 ++++----
 gnome-panel/panel-lockdown.c        |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gnome-panel/panel-global.schemas.in b/gnome-panel/panel-global.schemas.in
index 06421fc..6d8747c 100644
--- a/gnome-panel/panel-global.schemas.in
+++ b/gnome-panel/panel-global.schemas.in
@@ -234,10 +234,10 @@ Panel Global Config Schema File -  work in progress
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-          <short>Disable Lock Screen</short>
-          <long>If true, the panel will not allow a user to lock
-		their screen, by removing access to the lock screen
-		menu entries.
+          <short>Deprecated</short>
+	  <long>This key is deprecated as it cannot be used to implement proper
+		lockdown. The /desktop/gnome/lockdown/disable_lock_screen key
+		should be used instead.
           </long>
         </locale>
       </schema>
diff --git a/gnome-panel/panel-lockdown.c b/gnome-panel/panel-lockdown.c
index a4bb1eb..5b63ed2 100644
--- a/gnome-panel/panel-lockdown.c
+++ b/gnome-panel/panel-lockdown.c
@@ -35,7 +35,7 @@
 #define DESKTOP_GNOME_LOCKDOWN_DIR   "/desktop/gnome/lockdown"
 #define PANEL_GLOBAL_LOCKED_DOWN_KEY PANEL_GLOBAL_LOCKDOWN_DIR  "/locked_down"
 #define DISABLE_COMMAND_LINE_KEY     DESKTOP_GNOME_LOCKDOWN_DIR "/disable_command_line"
-#define DISABLE_LOCK_SCREEN_KEY      PANEL_GLOBAL_LOCKDOWN_DIR  "/disable_lock_screen"
+#define DISABLE_LOCK_SCREEN_KEY      DESKTOP_GNOME_LOCKDOWN_DIR  "/disable_lock_screen"
 #define DISABLE_LOG_OUT_KEY          PANEL_GLOBAL_LOCKDOWN_DIR  "/disable_log_out"
 #define DISABLE_FORCE_QUIT_KEY       PANEL_GLOBAL_LOCKDOWN_DIR  "/disable_force_quit"
 #define DISABLED_APPLETS_KEY         PANEL_GLOBAL_LOCKDOWN_DIR  "/disabled_applets"