diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-19 15:09:41 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-19 15:09:41 -0500 |
| commit | 5f9aa6649c58d953c3a09f3f23ea9a27d9160fec (patch) | |
| tree | 293e5c6be06108959e87da16c337accb563649f6 | |
| parent | cc42b03433dd3784a85780c8b10113c1a1b66f68 (diff) | |
| parent | 09514f45d0ab63579ce97faf07cbc0a79e981465 (diff) | |
| download | ayatana-indicator-session-5f9aa6649c58d953c3a09f3f23ea9a27d9160fec.tar.gz ayatana-indicator-session-5f9aa6649c58d953c3a09f3f23ea9a27d9160fec.tar.bz2 ayatana-indicator-session-5f9aa6649c58d953c3a09f3f23ea9a27d9160fec.zip | |
* Upstream Merge
* GSettings Fixes
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/settings-helper.h | 14 | ||||
| -rw-r--r-- | src/user-menu-mgr.c | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index a84cc94..d69834d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-session (0.3.2-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * Upstream Merge + * GSettings Fixes + + -- Ted Gould <ted@ubuntu.com> Fri, 19 Aug 2011 15:09:21 -0500 + indicator-session (0.3.2-0ubuntu2~ppa1) oneiric; urgency=low * Upstream Merge diff --git a/src/settings-helper.h b/src/settings-helper.h index 72d2111..7b377ca 100644 --- a/src/settings-helper.h +++ b/src/settings-helper.h @@ -31,15 +31,15 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/menuitem.h> -#define SESSION_SCHEMA "org.canonical.indicator.session" -#define SUPPRESS_KEY "suppress_logout_restart_shutdown" -#define LOGOUT_KEY "suppress_logout_menuitem" -#define RESTART_KEY "suppress_restart_menuitem" -#define SHUTDOWN_KEY "suppress_shutdown_menuitem" +#define SESSION_SCHEMA "com.canonical.indicator.session" +#define SUPPRESS_KEY "suppress-logout-restart-shutdown" +#define LOGOUT_KEY "suppress-logout-menuitem" +#define RESTART_KEY "suppress-restart-menuitem" +#define SHUTDOWN_KEY "suppress-shutdown-menuitem" #define LOCKDOWN_SCHEMA "org.gnome.desktop.lockdown" -#define LOCKDOWN_KEY_USER "disable_user_switching" -#define LOCKDOWN_KEY_SCREENSAVER "disable_lock_screen" +#define LOCKDOWN_KEY_USER "disable-user-switching" +#define LOCKDOWN_KEY_SCREENSAVER "disable-lock-screen" #define KEYBINDING_SCHEMA "org.gnome.settings-daemon.plugins.media-keys" #define KEY_LOCK_SCREEN "screensaver" diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index 718380c..30ea0ff 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -376,7 +376,7 @@ static void ensure_settings_client () { if(!settings) { - settings = g_settings_new (SESSION_SCHEMA); + settings = g_settings_new (LOCKDOWN_SCHEMA); } return; } |