aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-15 21:50:48 -0500
committerTed Gould <ted@gould.cx>2010-03-15 21:50:48 -0500
commit868fd5ed54d3d3e5ce8c054c9381602a2671e34d (patch)
tree0d4b973bc6e0dbe7d95930ce041ba4a9246454af
parent4c19fcf5d137c16beacdcda830366f473d34532b (diff)
downloadayatana-indicator-session-868fd5ed54d3d3e5ce8c054c9381602a2671e34d.tar.gz
ayatana-indicator-session-868fd5ed54d3d3e5ce8c054c9381602a2671e34d.tar.bz2
ayatana-indicator-session-868fd5ed54d3d3e5ce8c054c9381602a2671e34d.zip
Update to handle the new key for showing the logout menu item.
-rw-r--r--src/gconf-helper.c23
-rw-r--r--src/gconf-helper.h8
2 files changed, 27 insertions, 4 deletions
diff --git a/src/gconf-helper.c b/src/gconf-helper.c
index 5efc439..588b11c 100644
--- a/src/gconf-helper.c
+++ b/src/gconf-helper.c
@@ -43,6 +43,14 @@ supress_confirmations (void) {
return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ;
}
+gboolean
+show_logout (void) {
+ if(!gconf_client) {
+ gconf_client = gconf_client_get_default ();
+ }
+ return !gconf_client_get_bool (gconf_client, LOGOUT_KEY, NULL) ;
+}
+
static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) {
RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data;
GConfValue * value = gconf_entry_get_value (entry);
@@ -61,8 +69,19 @@ 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) {
+ 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));
+ }
+}
+
void
-update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
+update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi, DbusmenuMenuitem * logoutitem) {
if(!gconf_client) {
gconf_client = gconf_client_get_default ();
}
@@ -70,5 +89,7 @@ update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi)
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
gconf_client_notify_add (gconf_client, SUPPRESS_KEY,
update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL);
+ gconf_client_notify_add (gconf_client, LOGOUT_KEY,
+ update_logout_callback, logoutitem, NULL, NULL);
}
diff --git a/src/gconf-helper.h b/src/gconf-helper.h
index 951bb0f..6f9bcb7 100644
--- a/src/gconf-helper.h
+++ b/src/gconf-helper.h
@@ -33,8 +33,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-glib/menuitem.h>
-#define SUPPRESS_KEY "/apps/indicator-session/suppress_logout_restart_shutdown"
-#define GLOBAL_DIR "/apps/indicator-session"
+#define GLOBAL_DIR "/apps/indicator-session"
+#define SUPPRESS_KEY GLOBAL_DIR "/suppress_logout_restart_shutdown"
+#define LOGOUT_KEY GLOBAL_DIR "/suppress_logout_menuitem"
typedef struct _RestartShutdownLogoutMenuItems
{
@@ -44,7 +45,8 @@ typedef struct _RestartShutdownLogoutMenuItems
}
RestartShutdownLogoutMenuItems;
-void update_menu_entries(RestartShutdownLogoutMenuItems*);
+void update_menu_entries(RestartShutdownLogoutMenuItems*, DbusmenuMenuitem * logoutitem);
gboolean supress_confirmations (void);
+gboolean show_logout (void);
#endif /* __GCONF_HELPER__ */