diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-06 22:34:18 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-06 22:34:18 -0500 |
| commit | dfc07e29fc962fad1b87eb0f9eeb4ea3bfc4c840 (patch) | |
| tree | 7e1d46826e5544ba257d9ee4593afe480d2c2ba1 /src/session-service.c | |
| parent | cf5ace2d77add0de49cbe888b1b9cb57a4463d00 (diff) | |
| parent | 58cb1d4475110e662fa2d67717daa5b263c3331e (diff) | |
| download | ayatana-indicator-session-dfc07e29fc962fad1b87eb0f9eeb4ea3bfc4c840.tar.gz ayatana-indicator-session-dfc07e29fc962fad1b87eb0f9eeb4ea3bfc4c840.tar.bz2 ayatana-indicator-session-dfc07e29fc962fad1b87eb0f9eeb4ea3bfc4c840.zip | |
* Upstream Merge
* Making restart and shutdown items configurable (LP: #548810)
Diffstat (limited to 'src/session-service.c')
| -rw-r--r-- | src/session-service.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/session-service.c b/src/session-service.c index c522748..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"); @@ -673,7 +675,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)); |