aboutsummaryrefslogtreecommitdiff
path: root/src/settings-helper.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-17 14:03:25 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-17 14:03:25 -0500
commit63b800e6036bc9d5096d8f7b7db42a814b8a2bed (patch)
tree150d229310660daca351d19d6b2afab4affd56f7 /src/settings-helper.c
parent8cb934f213894b998bc3c471f5636fa9f0ae1dd4 (diff)
downloadayatana-indicator-session-63b800e6036bc9d5096d8f7b7db42a814b8a2bed.tar.gz
ayatana-indicator-session-63b800e6036bc9d5096d8f7b7db42a814b8a2bed.tar.bz2
ayatana-indicator-session-63b800e6036bc9d5096d8f7b7db42a814b8a2bed.zip
a step in merging the two menus: consolidate & clean up the code in session-menu-mgr
Diffstat (limited to 'src/settings-helper.c')
-rw-r--r--src/settings-helper.c133
1 files changed, 11 insertions, 122 deletions
diff --git a/src/settings-helper.c b/src/settings-helper.c
index d8e858f..0ab188a 100644
--- a/src/settings-helper.c
+++ b/src/settings-helper.c
@@ -20,138 +20,27 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <gio/gio.h>
-#include <glib/gi18n.h>
-
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem.h>
#include "dbus-shared-names.h"
#include "settings-helper.h"
static GSettings* settings = NULL;
-static guint confirmation_notify = 0;
-static guint logout_notify = 0;
-static guint restart_notify = 0;
-static guint shutdown_notify = 0;
-
static gboolean
-build_settings (void) {
- if (settings == NULL) {
- settings = g_settings_new (SESSION_SCHEMA);
- }
- if (settings == NULL) {
- return FALSE;
- }
- return TRUE;
-}
-
-gboolean
-supress_confirmations (void) {
- gboolean settings_built = build_settings();
- g_return_val_if_fail(settings_built, FALSE);
- return g_settings_get_boolean (settings, SUPPRESS_KEY) ;
-}
+build_settings (void)
+{
+ if (G_UNLIKELY(settings == NULL))
+ {
+ settings = g_settings_new (SESSION_SCHEMA);
+ }
-gboolean
-show_logout (void) {
- gboolean settings_built = build_settings();
- g_return_val_if_fail(settings_built, TRUE);
- return !g_settings_get_boolean (settings, LOGOUT_KEY) ;
+ return settings != NULL;
}
gboolean
-show_restart (void) {
- gboolean settings_built = build_settings();
- g_return_val_if_fail(settings_built, TRUE);
- return !g_settings_get_boolean (settings, RESTART_KEY) ;
-}
-
-gboolean
-show_shutdown (void) {
- gboolean settings_built = build_settings();
- g_return_val_if_fail(settings_built, TRUE);
- return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ;
-}
-
-static void update_menu_entries_callback (GSettings * settings, const gchar * key, gpointer data) {
- RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data;
-
- if(g_strcmp0 (key, SUPPRESS_KEY) == 0) {
- 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"));
- } else {
- 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…"));
- }
- }
-}
-
-static void
-update_logout_callback (GSettings * settings, const gchar * key, gpointer data) {
- DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data;
+supress_confirmations (void)
+{
+ g_return_val_if_fail (build_settings(), FALSE);
- if(g_strcmp0 (key, LOGOUT_KEY) == 0) {
- dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !g_settings_get_boolean(settings, key));
- }
+ return g_settings_get_boolean (settings, SUPPRESS_KEY) ;
}
-
-static void
-update_restart_callback (GSettings * settings, const gchar * key, gpointer data) {
- DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data;
-
- if(g_strcmp0 (key, RESTART_KEY) == 0) {
- dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !g_settings_get_boolean(settings, key));
- }
-}
-
-static void
-update_shutdown_callback (GSettings * settings, const gchar * key, gpointer data) {
- DbusmenuMenuitem * mi = (DbusmenuMenuitem*) data;
-
- if(g_strcmp0 (key, SHUTDOWN_KEY) == 0) {
- 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. */
- gboolean settings_built = build_settings();
- g_return_if_fail(settings_built);
-
- if (confirmation_notify != 0) {
- g_signal_handler_disconnect (settings, confirmation_notify);
- confirmation_notify = 0;
- }
-
- if (logout_notify != 0) {
- g_signal_handler_disconnect (settings, logout_notify);
- logout_notify = 0;
- }
-
- if (restart_notify != 0) {
- g_signal_handler_disconnect (settings, restart_notify);
- restart_notify = 0;
- }
-
- if (shutdown_notify != 0) {
- g_signal_handler_disconnect (settings, shutdown_notify);
- shutdown_notify = 0;
- }
-
- 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;
-}
-