diff options
| -rw-r--r-- | .bzrignore | 6 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | data/Makefile.am | 35 | ||||
| -rw-r--r-- | data/com.canonical.indicator.session.gschema.xml.in | 24 | ||||
| -rw-r--r-- | data/indicator-session.convert | 5 | ||||
| -rw-r--r-- | data/indicator-session.schemas.in | 50 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/device-menu-mgr.c | 75 | ||||
| -rw-r--r-- | src/dialog.c | 6 | ||||
| -rw-r--r-- | src/gtk-logout-helper.c | 2 | ||||
| -rw-r--r-- | src/indicator-session.c | 4 | ||||
| -rw-r--r-- | src/settings-helper.c (renamed from src/gconf-helper.c) | 102 | ||||
| -rw-r--r-- | src/settings-helper.h (renamed from src/gconf-helper.h) | 26 | ||||
| -rw-r--r-- | src/user-menu-mgr.c | 23 |
16 files changed, 166 insertions, 230 deletions
@@ -1,6 +1,6 @@ compile m4 -po +po/indicator-session.pot src/libmessaging.la src/libmessaging_la-indicator-messages.lo config.guess.cdbs-orig @@ -38,6 +38,7 @@ debian/indicator-sus.substvars gtk-logout-helper .deps .libs +test-ellipsis src/libsession.la src/libsession_la-indicator-session.lo src/status-provider-pidgin-marshal.c @@ -199,3 +200,6 @@ src/Makefile modified: .bzrignore src/libsession_la-user-widget.lo +consolekit-seat-client.h +data/com.canonical.indicator.session.gschema.valid +data/com.canonical.indicator.session.gschema.xml diff --git a/Makefile.am b/Makefile.am index 391ff49..5850769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,15 @@ dist-hook: else \ echo Failed to generate AUTHORS: not a branch >&2; \ fi + +TESTS = \ + test-ellipsis + +test-ellipsis: po + @echo "#!/bin/bash" > $@ + @echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@ + @echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @echo "exit 0" >> $@ + @chmod +x $@ + +CLEANFILES = $(TESTS) diff --git a/configure.ac b/configure.ac index 19cc4bc..0240b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,10 +4,12 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.1) +AM_INIT_AUTOMAKE(indicator-session, 0.3.2) AM_MAINTAINER_MODE +GLIB_GSETTINGS + IT_PROG_INTLTOOL([0.35.0]) AC_ISC_POSIX @@ -89,16 +91,6 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(GTKLOGOUTHELPER_CFLAGS) AC_SUBST(GTKLOGOUTHELPER_LIBS) -AC_PATH_PROG(GCONFTOOL, gconftool-2) -dnl Specify the gconf configuration source, -dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults - -AM_GCONF_SOURCE_2 - -PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0) -AC_SUBST(GCONF_CFLAGS) -AC_SUBST(GCONF_LIBS) - ########################### # Check to see if we're local ########################### diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..27328fb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,37 +9,22 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - @INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ +gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml + +convertdir = $(datadir)/GConf/gsettings +dist_convert_DATA = indicator-session.convert -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) + CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif + $(gsettings_SCHEMAS) + diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in new file mode 100644 index 0000000..0cb6815 --- /dev/null +++ b/data/com.canonical.indicator.session.gschema.xml.in @@ -0,0 +1,24 @@ +<schemalist> + <schema id="com.canonical.indicator.session" path="/apps/indicator-session/"> + <key name="suppress-logout-restart-shutdown" type="b"> + <default>false</default> + <_summary>Suppress the dialog to confirm logout, restart and shutdown action</_summary> + <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</_description> + </key> + <key name="suppress-logout-menuitem" type="b"> + <default>false</default> + <_summary>Remove the Log Out item from the session menu</_summary> + <_description>Makes it so that the logout button doesn't show in the session menu.</_description> + </key> + <key name="suppress-restart-menuitem" type="b"> + <default>false</default> + <_summary>Remove the Restart item from the session menu</_summary> + <_description>Makes it so that the restart button doesn't show in the session menu.</_description> + </key> + <key name="suppress-shutdown-menuitem" type="b"> + <default>false</default> + <_summary>Remove the shutdown item from the session menu</_summary> + <_description>Makes it so that the shutdown button doesn't show in the session menu.</_description> + </key> + </schema> +</schemalist> diff --git a/data/indicator-session.convert b/data/indicator-session.convert new file mode 100644 index 0000000..3a087a6 --- /dev/null +++ b/data/indicator-session.convert @@ -0,0 +1,5 @@ +[com.canonical.indicator.session] +suppress_logout_restart_shutdown = /apps/indicator-session/suppress_logout_restart_shutdown +suppress_logout_menuitem = /apps/indicator-session/suppress_logout_menuitem +suppress_restart_menuitem = /apps/indicator-session/suppress_restart_menuitem +suppress_shutdown_menuitem = /apps/indicator-session/suppress_shutdown_menuitem diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in deleted file mode 100644 index f4e70da..0000000 --- a/data/indicator-session.schemas.in +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<gconfschemafile> - <schemalist> - <schema> - <key>/schemas/apps/indicator-session/suppress_logout_restart_shutdown</key> - <applyto>/apps/indicator-session/suppress_logout_restart_shutdown</applyto> - <owner>indicator-session</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Suppress the dialog to confirm logout, restart and shutdown action</short> - <long>Whether or not to show confirmation dialogs for logout, - restart and shutdown actions.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/indicator-session/suppress_logout_menuitem</key> - <applyto>/apps/indicator-session/suppress_logout_menuitem</applyto> - <owner>indicator-session</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Remove the Log Out item from the session menu</short> - <long>Makes it so that the logout button doesn't show in the session menu.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/indicator-session/suppress_restart_menuitem</key> - <applyto>/apps/indicator-session/suppress_restart_menuitem</applyto> - <owner>indicator-session</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Remove the Restart item from the session menu</short> - <long>Makes it so that the restart button doesn't show in the session menu.</long> - </locale> - </schema> - <schema> - <key>/schemas/apps/indicator-session/suppress_shutdown_menuitem</key> - <applyto>/apps/indicator-session/suppress_shutdown_menuitem</applyto> - <owner>indicator-session</owner> - <type>bool</type> - <default>FALSE</default> - <locale name="C"> - <short>Remove the shutdown item from the session menu</short> - <long>Makes it so that the shutdown button doesn't show in the session menu.</long> - </locale> - </schema> - </schemalist> -</gconfschemafile> diff --git a/po/POTFILES.in b/po/POTFILES.in index 08eff5f..df89ec9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ [encoding: UTF-8] -data/indicator-session.schemas.in +data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in -src/gconf-helper.c +src/settings-helper.c src/lock-helper.c src/gtk-logout-helper.c src/dialog.c diff --git a/src/Makefile.am b/src/Makefile.am index 3bfd790..dba0a9e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -96,11 +96,11 @@ indicator_session_service_SOURCES = \ session-dbus.h \ gen-session-dbus.xml.c \ dbusmenu-shared.h \ - gconf-helper.c \ + settings-helper.c \ users-service-dbus.h \ users-service-dbus.c \ user-menu-mgr.h \ - user-menu-mgr.c \ + user-menu-mgr.c \ device-menu-mgr.h \ device-menu-mgr.c \ apt-watcher.h \ @@ -126,8 +126,8 @@ indicator_session_service_LDADD = \ gtk_logout_helper_SOURCES = \ gtk-logout-helper.c \ - gconf-helper.c \ - gconf-helper.h \ + settings-helper.c \ + settings-helper.h \ dialog.c \ dialog.h diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index cbddaa3..c298682 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -21,7 +21,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-gtk3/menuitem.h> #include "device-menu-mgr.h" -#include "gconf-helper.h" +#include "settings-helper.h" #include "dbus-shared-names.h" #include "dbusmenu-shared.h" #include "lock-helper.h" @@ -44,7 +44,8 @@ struct _DeviceMenuMgr UdevMgr* udev_mgr; }; -static GConfClient *gconf_client = NULL; +static GSettings *lockdown_settings = NULL; +static GSettings *keybinding_settings = NULL; static DbusmenuMenuitem *lock_menuitem = NULL; static DbusmenuMenuitem *system_settings_menuitem = NULL; static DbusmenuMenuitem *display_settings_menuitem = NULL; @@ -72,7 +73,7 @@ static gboolean allow_suspend = TRUE; static DBusGProxy * up_main_proxy = NULL; static DBusGProxy * up_prop_proxy = NULL; -static void device_menu_mgr_ensure_gconf_client (DeviceMenuMgr* self); +static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self); static void setup_restart_watch (DeviceMenuMgr* self); static void setup_up (DeviceMenuMgr* self); static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self); @@ -128,21 +129,18 @@ device_menu_mgr_class_init (DeviceMenuMgrClass *klass) // TODO // Is this needed anymore static void -lockdown_changed (GConfClient *client, - guint cnxd_id, - GConfEntry *entry, +lockdown_changed (GSettings * settings, + const gchar * key, gpointer user_data) { - DeviceMenuMgr* self = DEVICE_MENU_MGR (user_data); - GConfValue *value = gconf_entry_get_value (entry); - const gchar *key = gconf_entry_get_key (entry); + DeviceMenuMgr* self = DEVICE_MENU_MGR (user_data); - if (value == NULL || key == NULL) { + if (key == NULL) { return; } if (g_strcmp0 (key, LOCKDOWN_KEY_USER) == 0 || - g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) { + g_strcmp0 (key, LOCKDOWN_KEY_SCREENSAVER) == 0) { device_menu_mgr_rebuild_items(self); } @@ -150,23 +148,19 @@ lockdown_changed (GConfClient *client, } static void -keybinding_changed (GConfClient *client, - guint cnxd_id, - GConfEntry *entry, +keybinding_changed (GSettings *settings, + const gchar *key, gpointer user_data) { - GConfValue *value = gconf_entry_get_value (entry); - const gchar *key = gconf_entry_get_key (entry); - - if (value == NULL || key == NULL) { + if (key == NULL) { return; } if (g_strcmp0 (key, KEY_LOCK_SCREEN) == 0) { - g_debug("Keybinding changed to: %s", gconf_value_get_string(value)); + g_debug("Keybinding changed to: %s", g_settings_get_string(settings, key)); if (lock_menuitem != NULL) { dbusmenu_menuitem_property_set_shortcut_string (lock_menuitem, - gconf_value_get_string(value)); + g_settings_get_string(settings, key)); } } return; @@ -176,9 +170,9 @@ keybinding_changed (GConfClient *client, locking the screen. If not, lock it. */ static void lock_if_possible (DeviceMenuMgr* self) { - device_menu_mgr_ensure_gconf_client (self); + device_menu_mgr_ensure_settings_client (self); - if (!gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_SCREENSAVER, NULL)) { + if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) { lock_screen (NULL, 0, NULL); } return; @@ -659,10 +653,9 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode) /* Make sure we have a valid GConf client, and build one if needed */ - device_menu_mgr_ensure_gconf_client (self); - can_lockscreen = !gconf_client_get_bool ( gconf_client, - LOCKDOWN_KEY_SCREENSAVER, - NULL); + device_menu_mgr_ensure_settings_client (self); + can_lockscreen = !g_settings_get_boolean (lockdown_settings, + LOCKDOWN_KEY_SCREENSAVER); /* Lock screen item */ if (can_lockscreen) { lock_menuitem = dbusmenu_menuitem_new(); @@ -670,7 +663,7 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode) DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen")); - gchar * shortcut = gconf_client_get_string(gconf_client, KEY_LOCK_SCREEN, NULL); + gchar * shortcut = g_settings_get_string(keybinding_settings, KEY_LOCK_SCREEN); if (shortcut != NULL) { g_debug("Lock screen shortcut: %s", shortcut); dbusmenu_menuitem_property_set_shortcut_string(lock_menuitem, shortcut); @@ -830,26 +823,18 @@ setup_restart_watch (DeviceMenuMgr* self) /* Ensures that we have a GConf client and if we build one set up the signal handler. */ static void -device_menu_mgr_ensure_gconf_client (DeviceMenuMgr* self) +device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self) { - if (!gconf_client) { - gconf_client = gconf_client_get_default (); - gconf_client_add_dir(gconf_client, LOCKDOWN_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_notify_add (gconf_client, - LOCKDOWN_DIR, - lockdown_changed, - self, - NULL, - NULL); - - gconf_client_add_dir(gconf_client, KEYBINDING_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_notify_add (gconf_client, - KEYBINDING_DIR, - keybinding_changed, - self, - NULL, - NULL); + if (!lockdown_settings) { + lockdown_settings = g_settings_new (LOCKDOWN_SCHEMA); + g_signal_connect(lockdown_settings, "changed", G_CALLBACK(lockdown_changed), self); + } + if (!keybinding_settings) { + keybinding_settings = g_settings_new (KEYBINDING_SCHEMA); + g_signal_connect(lockdown_settings, "changed::" KEY_LOCK_SCREEN, G_CALLBACK(keybinding_changed), self); } + + return; } DbusmenuMenuitem* diff --git a/src/dialog.c b/src/dialog.c index 299f954..45cfdcb 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -53,15 +53,15 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { they are also going to get a password dialog to do the action. */ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"), - /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down...") + /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…") }; /* TRANSLATORS: This button appears on the logout dialog when there are updates that require restart. It will do a restart in place of a log out. */ static const gchar * restart_updates = N_("Restart Instead"); -static const gchar * restart_auth = N_("Restart Instead..."); +static const gchar * restart_auth = N_("Restart Instead…"); static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { diff --git a/src/gtk-logout-helper.c b/src/gtk-logout-helper.c index b8923c6..33dce3a 100644 --- a/src/gtk-logout-helper.c +++ b/src/gtk-logout-helper.c @@ -26,7 +26,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <gtk/gtk.h> #include <dbus/dbus-glib.h> #include "dialog.h" -#include "gconf-helper.h" +#include "settings-helper.h" static void consolekit_fallback (LogoutDialogType action) diff --git a/src/indicator-session.c b/src/indicator-session.c index f6727d9..c980378 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -527,7 +527,7 @@ switch_property_change (DbusmenuMenuitem * item, if (variant == NULL || g_variant_get_string(variant, NULL) == NULL || g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) { - finalstring = _("Switch User..."); + finalstring = _("Switch User…"); set_ellipsize = FALSE; } @@ -554,7 +554,7 @@ switch_property_change (DbusmenuMenuitem * item, gdouble ems = width / pixels_per_em; g_debug("Username width %fem", ems); - finalstring = g_strdup_printf(_("Switch From %s..."), username); + finalstring = g_strdup_printf(_("Switch From %s…"), username); if (ems >= 20.0f) { set_ellipsize = TRUE; } else { diff --git a/src/gconf-helper.c b/src/settings-helper.c index 93ae96f..5a69d17 100644 --- a/src/gconf-helper.c +++ b/src/settings-helper.c @@ -1,5 +1,5 @@ /* -A small wrapper utility for connecting to gconf. +A small wrapper utility for connecting to GSettings. Copyright 2009 Canonical Ltd. @@ -19,9 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include <gconf/gconf-client.h> - +#include <gio/gio.h> #include <glib/gi18n.h> #include <dbus/dbus-glib.h> @@ -31,53 +29,52 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/menuitem.h> #include "dbus-shared-names.h" -#include "gconf-helper.h" +#include "settings-helper.h" + +static GSettings* settings = NULL; -static GConfClient * gconf_client = NULL; static guint confirmation_notify = 0; static guint logout_notify = 0; static guint restart_notify = 0; static guint shutdown_notify = 0; +static void +build_settings (void) { + if(!settings) { + settings = g_settings_new (SESSION_SCHEMA); + } + return; +} + gboolean supress_confirmations (void) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ; + build_settings(); + return g_settings_get_boolean (settings, SUPPRESS_KEY) ; } gboolean show_logout (void) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - return !gconf_client_get_bool (gconf_client, LOGOUT_KEY, NULL) ; + build_settings(); + return !g_settings_get_boolean (settings, LOGOUT_KEY) ; } gboolean show_restart (void) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - return !gconf_client_get_bool (gconf_client, RESTART_KEY, NULL) ; + build_settings(); + return !g_settings_get_boolean (settings, RESTART_KEY) ; } gboolean show_shutdown (void) { - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - return !gconf_client_get_bool (gconf_client, SHUTDOWN_KEY, NULL) ; + build_settings(); + return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ; } -static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { +static void update_menu_entries_callback (GSettings * settings, const gchar * key, gpointer data) { RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data; - GConfValue * value = gconf_entry_get_value (entry); - const gchar * key = gconf_entry_get_key (entry); if(g_strcmp0 (key, SUPPRESS_KEY) == 0) { - if (gconf_value_get_bool (value)) { + if (g_settings_get_boolean (settings, key)) { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); @@ -90,80 +87,65 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC } static void -update_logout_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { +update_logout_callback (GSettings * settings, const gchar * key, gpointer data) { DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data; - GConfValue * value = gconf_entry_get_value (entry); - const gchar * key = gconf_entry_get_key (entry); if(g_strcmp0 (key, LOGOUT_KEY) == 0) { - dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value)); + dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !g_settings_get_boolean(settings, key)); } } static void -update_restart_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { +update_restart_callback (GSettings * settings, const gchar * key, gpointer data) { DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data; - GConfValue * value = gconf_entry_get_value (entry); - const gchar * key = gconf_entry_get_key (entry); if(g_strcmp0 (key, RESTART_KEY) == 0) { - dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value)); + dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !g_settings_get_boolean(settings, key)); } } static void -update_shutdown_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) { +update_shutdown_callback (GSettings * settings, const gchar * key, gpointer data) { DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data; - GConfValue * value = gconf_entry_get_value (entry); - const gchar * key = gconf_entry_get_key (entry); if(g_strcmp0 (key, SHUTDOWN_KEY) == 0) { - dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value)); + dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !g_settings_get_boolean(settings, key)); } } void update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) { /* If we don't have a client, build one. */ - if(!gconf_client) { - gconf_client = gconf_client_get_default (); - } - - /* If we've not gotten any notifications, then we need - to add the directory for notifications to come from. */ - if (confirmation_notify == 0 || logout_notify == 0) { - gconf_client_add_dir (gconf_client, GLOBAL_DIR, - GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - } + build_settings(); if (confirmation_notify != 0) { - gconf_client_notify_remove (gconf_client, confirmation_notify); + g_signal_handler_disconnect (settings, confirmation_notify); confirmation_notify = 0; } if (logout_notify != 0) { - gconf_client_notify_remove (gconf_client, logout_notify); + g_signal_handler_disconnect (settings, logout_notify); logout_notify = 0; } if (restart_notify != 0) { - gconf_client_notify_remove (gconf_client, restart_notify); + g_signal_handler_disconnect (settings, restart_notify); restart_notify = 0; } if (shutdown_notify != 0) { - gconf_client_notify_remove (gconf_client, shutdown_notify); + g_signal_handler_disconnect (settings, shutdown_notify); shutdown_notify = 0; } - confirmation_notify = gconf_client_notify_add (gconf_client, SUPPRESS_KEY, - update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL); - logout_notify = gconf_client_notify_add (gconf_client, LOGOUT_KEY, - update_logout_callback, restart_shutdown_logout_mi->logout_mi, NULL, NULL); - restart_notify = gconf_client_notify_add (gconf_client, RESTART_KEY, - update_restart_callback, restart_shutdown_logout_mi->restart_mi, NULL, NULL); - shutdown_notify = gconf_client_notify_add (gconf_client, SHUTDOWN_KEY, - update_shutdown_callback, restart_shutdown_logout_mi->shutdown_mi, NULL, NULL); + confirmation_notify = g_signal_connect (settings, "changed::" SUPPRESS_KEY, + G_CALLBACK(update_menu_entries_callback), restart_shutdown_logout_mi); + logout_notify = g_signal_connect (settings, "changed::" LOGOUT_KEY, + G_CALLBACK(update_logout_callback), restart_shutdown_logout_mi->logout_mi); + restart_notify = g_signal_connect (settings, "changed::" RESTART_KEY, + G_CALLBACK(update_restart_callback), restart_shutdown_logout_mi->restart_mi); + shutdown_notify = g_signal_connect (settings, "changed::" SHUTDOWN_KEY, + G_CALLBACK(update_shutdown_callback), restart_shutdown_logout_mi->shutdown_mi); return; } diff --git a/src/gconf-helper.h b/src/settings-helper.h index 039b309..7b377ca 100644 --- a/src/gconf-helper.h +++ b/src/settings-helper.h @@ -1,5 +1,5 @@ /* -A small wrapper utility for connecting to gconf. +A small wrapper utility for connecting to GSettings. Copyright 2009 Canonical Ltd. @@ -23,8 +23,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef __GCONF_HELPER_H__ #define __GCONF_HELPER_H__ 1 -#include <gconf/gconf-client.h> - #include <glib/gi18n.h> #include <dbus/dbus-glib.h> @@ -33,17 +31,17 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/menuitem.h> -#define GLOBAL_DIR "/apps/indicator-session" -#define SUPPRESS_KEY GLOBAL_DIR "/suppress_logout_restart_shutdown" -#define LOGOUT_KEY GLOBAL_DIR "/suppress_logout_menuitem" -#define RESTART_KEY GLOBAL_DIR "/suppress_restart_menuitem" -#define SHUTDOWN_KEY GLOBAL_DIR "/suppress_shutdown_menuitem" - -#define LOCKDOWN_DIR "/desktop/gnome/lockdown" -#define LOCKDOWN_KEY_USER LOCKDOWN_DIR "/disable_user_switching" -#define LOCKDOWN_KEY_SCREENSAVER LOCKDOWN_DIR "/disable_lock_screen" -#define KEYBINDING_DIR "/apps/gnome_settings_daemon/keybindings" -#define KEY_LOCK_SCREEN KEYBINDING_DIR "/screensaver" +#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 KEYBINDING_SCHEMA "org.gnome.settings-daemon.plugins.media-keys" +#define KEY_LOCK_SCREEN "screensaver" typedef struct _RestartShutdownLogoutMenuItems { diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index bbe51a9..667ebb4 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -20,13 +20,13 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/client.h> #include "user-menu-mgr.h" -#include "gconf-helper.h" +#include "settings-helper.h" #include "dbus-shared-names.h" #include "dbusmenu-shared.h" #include "lock-helper.h" #include "users-service-dbus.h" -static GConfClient * gconf_client = NULL; +static GSettings* settings = NULL; static DbusmenuMenuitem *switch_menuitem = NULL; struct _UserMenuMgr @@ -56,7 +56,7 @@ static void user_change (UsersServiceDbus *service, const gchar *user_id, gpointer user_data); -static void ensure_gconf_client (); +static void ensure_settings_client (); static gboolean check_guest_session (void); static void activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, @@ -110,11 +110,11 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode) /* Make sure we have a valid GConf client, and build one if needed */ - ensure_gconf_client (); + ensure_settings_client (); /* Check to see which menu items we're allowed to have */ can_activate = users_service_dbus_can_activate_session (self->users_dbus_interface) && - !gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_USER, NULL); + !g_settings_get_boolean (settings, LOCKDOWN_KEY_USER); /* Remove the old menu items if that makes sense */ children = dbusmenu_menuitem_take_children (self->root_item); @@ -305,9 +305,9 @@ check_new_session () locking the screen. If not, lock it. */ static void lock_if_possible (void) { - ensure_gconf_client (); + ensure_settings_client (); - if (!gconf_client_get_bool (gconf_client, LOCKDOWN_KEY_SCREENSAVER, NULL)) { + if (!g_settings_get_boolean (settings, LOCKDOWN_KEY_SCREENSAVER)) { lock_screen(NULL, 0, NULL); } @@ -403,13 +403,12 @@ user_change (UsersServiceDbus *service, /* Ensures that we have a GConf client and if we build one set up the signal handler. */ static void -ensure_gconf_client () +ensure_settings_client () { - if (!gconf_client) { - gconf_client = gconf_client_get_default (); - gconf_client_add_dir (gconf_client, LOCKDOWN_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - gconf_client_add_dir (gconf_client, KEYBINDING_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + if(!settings) { + settings = g_settings_new (LOCKDOWN_SCHEMA); } + return; } DbusmenuMenuitem* |