summaryrefslogtreecommitdiff
path: root/mate-panel
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-04 21:37:57 +0100
committerinfirit <[email protected]>2014-11-04 21:56:00 +0100
commitd16d491d2fbe94e3c0711c9b5282734e0f26d33f (patch)
treecead0504408e403b9fbe039f4eb668fce87315c7 /mate-panel
parentfe814c53964746c20e9c113ff9dcbfc6a9634f0e (diff)
downloadmate-panel-d16d491d2fbe94e3c0711c9b5282734e0f26d33f.tar.bz2
mate-panel-d16d491d2fbe94e3c0711c9b5282734e0f26d33f.tar.xz
lockdown: move disable-lock-down key to lockdown schema
In order to use it in other parts of MATE.
Diffstat (limited to 'mate-panel')
-rw-r--r--mate-panel/panel-lockdown.c4
-rw-r--r--mate-panel/panel-schemas.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/mate-panel/panel-lockdown.c b/mate-panel/panel-lockdown.c
index ae1c87e0..212f66f5 100644
--- a/mate-panel/panel-lockdown.c
+++ b/mate-panel/panel-lockdown.c
@@ -179,8 +179,8 @@ panel_lockdown_init (void)
panel_lockdown.disable_log_out =
panel_lockdown_load_bool (&panel_lockdown,
- panel_lockdown.panel_settings,
- PANEL_DISABLE_LOG_OUT_KEY,
+ panel_lockdown.lockdown_settings,
+ LOCKDOWN_DISABLE_LOG_OUT_KEY,
G_CALLBACK (disable_log_out_notify));
panel_lockdown.disable_force_quit =
diff --git a/mate-panel/panel-schemas.h b/mate-panel/panel-schemas.h
index ee7c894b..53247f99 100644
--- a/mate-panel/panel-schemas.h
+++ b/mate-panel/panel-schemas.h
@@ -14,7 +14,6 @@
#define PANEL_TOPLEVEL_ID_LIST_KEY "toplevel-id-list"
#define PANEL_OBJECT_ID_LIST_KEY "object-id-list"
#define PANEL_LOCKED_DOWN_KEY "locked-down"
-#define PANEL_DISABLE_LOG_OUT_KEY "disable-log-out"
#define PANEL_DISABLE_FORCE_QUIT_KEY "disable-force-quit"
#define PANEL_DISABLED_APPLETS_KEY "disabled-applets"
@@ -82,6 +81,7 @@
#define LOCKDOWN_SCHEMA "org.mate.lockdown"
#define LOCKDOWN_DISABLE_COMMAND_LINE_KEY "disable-command-line"
#define LOCKDOWN_DISABLE_LOCK_SCREEN_KEY "disable-lock-screen"
+#define LOCKDOWN_DISABLE_LOG_OUT_KEY "disable-log-out"
#define MARCO_SCHEMA "org.mate.Marco.general"
#define MARCO_MOUSE_BUTTON_MODIFIER_KEY "mouse-button-modifier"