diff options
| author | infirit <[email protected]> | 2014-11-04 21:37:57 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-04 21:56:00 +0100 |
| commit | d16d491d2fbe94e3c0711c9b5282734e0f26d33f (patch) | |
| tree | cead0504408e403b9fbe039f4eb668fce87315c7 | |
| parent | fe814c53964746c20e9c113ff9dcbfc6a9634f0e (diff) | |
| download | mate-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.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/org.mate.panel.gschema.xml.in.in | 5 | ||||
| -rw-r--r-- | mate-panel/panel-lockdown.c | 4 | ||||
| -rw-r--r-- | mate-panel/panel-schemas.h | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 306a5163..1e40dda3 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ fi AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNCS(_NSGetEnviron) -LIBMATE_DESKTOP_REQUIRED=1.9.1 +LIBMATE_DESKTOP_REQUIRED=1.9.3 GDK_PIXBUF_REQUIRED=2.7.1 PANGO_REQUIRED=1.15.4 GLIB_REQUIRED=2.36 diff --git a/data/org.mate.panel.gschema.xml.in.in b/data/org.mate.panel.gschema.xml.in.in index ec613941..f302651a 100644 --- a/data/org.mate.panel.gschema.xml.in.in +++ b/data/org.mate.panel.gschema.xml.in.in @@ -69,11 +69,6 @@ <_summary>Applet IIDs to disable from loading</_summary> <_description>A list of applet IIDs that the panel will ignore. This way you can disable certain applets from loading or showing up in the menu. For example to disable the mini-commander applet add 'OAFIID:MATE_MiniCommanderApplet' to this list. The panel must be restarted for this to take effect.</_description> </key> - <key name="disable-log-out" type="b"> - <default>false</default> - <_summary>Disable Logging Out</_summary> - <_description>If true, the panel will not allow a user to log out, by removing access to the log out menu entries.</_description> - </key> <key name="disable-force-quit" type="b"> <default>false</default> <_summary>Disable Force Quit</_summary> 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" |