[gnome-screensaver] Put lockdown keys together

[William Jon McCann <mccann src gnome org>]

commit fd7f7578839b3cca0b26acf7cfd1e8ae9ab25505
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Mar 17 00:36:56 2011 -0400

    Put lockdown keys together

 src/gs-prefs.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index 6b13905..f70b4ba 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -254,12 +254,6 @@ gs_prefs_load_from_settings (GSPrefs *prefs)
         bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_LOCK_ENABLED);
         _gs_prefs_set_lock_enabled (prefs, bvalue);
 
-        bvalue = g_settings_get_boolean (prefs->priv->lockdown, KEY_LOCK_DISABLE);
-        _gs_prefs_set_lock_disabled (prefs, bvalue);
-
-        bvalue = g_settings_get_boolean (prefs->priv->lockdown, KEY_USER_SWITCH_DISABLE);
-        _gs_prefs_set_user_switch_disabled (prefs, bvalue);
-
         uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_LOCK_DELAY);
         _gs_prefs_set_lock_timeout (prefs, uvalue);
 
@@ -291,6 +285,15 @@ gs_prefs_load_from_settings (GSPrefs *prefs)
 
         bvalue = g_settings_get_boolean (prefs->priv->settings, KEY_USER_SWITCH_ENABLED);
         _gs_prefs_set_user_switch_enabled (prefs, bvalue);
+
+        /* Lockdown keys */
+
+        bvalue = g_settings_get_boolean (prefs->priv->lockdown, KEY_LOCK_DISABLE);
+        _gs_prefs_set_lock_disabled (prefs, bvalue);
+
+        bvalue = g_settings_get_boolean (prefs->priv->lockdown, KEY_USER_SWITCH_DISABLE);
+        _gs_prefs_set_user_switch_disabled (prefs, bvalue);
+
 }
 
 static void