From 79c9706e99fb458644f12cce7b7b37a78d36f6dd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 16:54:46 -0500 Subject: Adding configuration options for the restart menuitem and the shutdown one. --- data/indicator-session.schemas.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in index bb8a147..3380c94 100644 --- a/data/indicator-session.schemas.in +++ b/data/indicator-session.schemas.in @@ -24,5 +24,27 @@ Makes it so that the logout button doesn't show in the session menu. + + /schemas/apps/indicator-session/suppress_restart_menuitem + /apps/indicator-session/suppress_restart_menuitem + indicator-session + bool + FALSE + + Remove the Restart item from the session menu + Makes it so that the restart button doesn't show in the session menu. + + + + /schemas/apps/indicator-session/suppress_shutdown_menuitem + /apps/indicator-session/suppress_shutdown_menuitem + indicator-session + bool + FALSE + + Remove the shutdown item from the session menu + Makes it so that the shutdown button doesn't show in the session menu. + + -- cgit v1.2.3 From fd1e69241e772a7f9f463ce98bf532c78fdf91f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 16:56:04 -0500 Subject: Formatting --- data/indicator-session.schemas.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in index 3380c94..f4e70da 100644 --- a/data/indicator-session.schemas.in +++ b/data/indicator-session.schemas.in @@ -2,16 +2,16 @@ - /schemas/apps/indicator-session/suppress_logout_restart_shutdown - /apps/indicator-session/suppress_logout_restart_shutdown - indicator-session - bool - FALSE - - Suppress the dialog to confirm logout, restart and shutdown action - Whether or not to show confirmation dialogs for logout, - restart and shutdown actions. - + /schemas/apps/indicator-session/suppress_logout_restart_shutdown + /apps/indicator-session/suppress_logout_restart_shutdown + indicator-session + bool + FALSE + + Suppress the dialog to confirm logout, restart and shutdown action + Whether or not to show confirmation dialogs for logout, + restart and shutdown actions. + /schemas/apps/indicator-session/suppress_logout_menuitem -- cgit v1.2.3 From 07dcd3f24ee57e0ee895e457f1b07bd126c2facf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 17:24:42 -0500 Subject: Adding the restart and shutdown keys and functions to check them. --- src/gconf-helper.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gconf-helper.h b/src/gconf-helper.h index 6f9bcb7..505c24f 100644 --- a/src/gconf-helper.h +++ b/src/gconf-helper.h @@ -36,6 +36,8 @@ with this program. If not, see . #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" typedef struct _RestartShutdownLogoutMenuItems { @@ -45,8 +47,10 @@ typedef struct _RestartShutdownLogoutMenuItems } RestartShutdownLogoutMenuItems; -void update_menu_entries(RestartShutdownLogoutMenuItems*, DbusmenuMenuitem * logoutitem); +void update_menu_entries(RestartShutdownLogoutMenuItems*); gboolean supress_confirmations (void); gboolean show_logout (void); +gboolean show_restart (void); +gboolean show_shutdown (void); #endif /* __GCONF_HELPER__ */ -- cgit v1.2.3 From 234ca9cd5a231b6beee298539203b4de4d27e5bc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 17:25:05 -0500 Subject: Filling out everything to check and update the shutdown/restart items --- src/gconf-helper.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/src/gconf-helper.c b/src/gconf-helper.c index 29d8526..4911dcb 100644 --- a/src/gconf-helper.c +++ b/src/gconf-helper.c @@ -36,6 +36,8 @@ with this program. If not, see . 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; gboolean supress_confirmations (void) { @@ -53,6 +55,22 @@ show_logout (void) { return !gconf_client_get_bool (gconf_client, LOGOUT_KEY, NULL) ; } +gboolean +show_restart (void) { + if(!gconf_client) { + gconf_client = gconf_client_get_default (); + } + return !gconf_client_get_bool (gconf_client, RESTART_KEY, NULL) ; +} + +gboolean +show_shutdown (void) { + if(!gconf_client) { + gconf_client = gconf_client_get_default (); + } + return !gconf_client_get_bool (gconf_client, SHUTDOWN_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); @@ -82,8 +100,30 @@ update_logout_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, } } +static void +update_restart_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, RESTART_KEY) == 0) { + dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value)); + } +} + +static void +update_shutdown_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, SHUTDOWN_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, DbusmenuMenuitem * logoutitem) { +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 (); @@ -106,9 +146,25 @@ update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi, logout_notify = 0; } + if (restart_notify != 0) { + gconf_client_notify_remove (gconf_client, restart_notify); + restart_notify = 0; + } + + if (shutdown_notify != 0) { + gconf_client_notify_remove (gconf_client, 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, logoutitem, NULL, NULL); + 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); + + return; } -- cgit v1.2.3 From 54f8f8b90005978ed2376d695bb22947f0878c0b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 17:25:22 -0500 Subject: Changing prototype to not have the same info twice. --- src/session-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session-service.c b/src/session-service.c index c522748..054bb17 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -673,7 +673,7 @@ rebuild_items (DbusmenuMenuitem *root, restart_shutdown_logout_mi->restart_mi = restart_mi; restart_shutdown_logout_mi->shutdown_mi = shutdown_mi; - update_menu_entries(restart_shutdown_logout_mi, logout_mi); + update_menu_entries(restart_shutdown_logout_mi); if (g_file_test(DESKTOP_FILE, G_FILE_TEST_EXISTS)) { GAppInfo * appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(DESKTOP_FILE)); -- cgit v1.2.3 From 58cb1d4475110e662fa2d67717daa5b263c3331e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Apr 2010 17:26:41 -0500 Subject: Check to see if the shutdown and restart items should be shown on first run. --- src/session-service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/session-service.c b/src/session-service.c index 054bb17..4fc12a1 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -656,6 +656,7 @@ rebuild_items (DbusmenuMenuitem *root, } else { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); } + dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart()); dbusmenu_menuitem_child_append(root, restart_mi); g_signal_connect(G_OBJECT(restart_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart"); @@ -665,6 +666,7 @@ rebuild_items (DbusmenuMenuitem *root, } else { dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); } + dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown()); dbusmenu_menuitem_child_append(root, shutdown_mi); g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown"); -- cgit v1.2.3