diff options
| author | Ted Gould <ted@gould.cx> | 2012-10-01 17:39:38 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2012-10-01 17:39:38 +0000 |
| commit | 8aec4a8be0e8d05d6c58b7657d68de8f039f1d34 (patch) | |
| tree | 883581dd0c1ee7b7e831553927906429ee64b1d0 /src/session-menu-mgr.c | |
| parent | f5a2bb4a0f3262196be351ac1c0b13a269f52b12 (diff) | |
| parent | 79a2f85857aface06962f660b7aa975fe3bf58e3 (diff) | |
| download | ayatana-indicator-session-8aec4a8be0e8d05d6c58b7657d68de8f039f1d34.tar.gz ayatana-indicator-session-8aec4a8be0e8d05d6c58b7657d68de8f039f1d34.tar.bz2 ayatana-indicator-session-8aec4a8be0e8d05d6c58b7657d68de8f039f1d34.zip | |
Remove the custom menu type for the restart entry. Fixes: https://bugs.launchpad.net/bugs/1058148. Approved by Charles Kerr, Lars Uebernickel.
Diffstat (limited to 'src/session-menu-mgr.c')
| -rw-r--r-- | src/session-menu-mgr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/session-menu-mgr.c b/src/session-menu-mgr.c index 2800126..f5b5bcf 100644 --- a/src/session-menu-mgr.c +++ b/src/session-menu-mgr.c @@ -490,8 +490,7 @@ update_confirmation_labels (SessionMenuMgr * mgr) mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246") : _("Shut Down")); - dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL, - confirm_needed ? _("Restart\342\200\246") + mi_set_label (mgr->restart_mi, confirm_needed ? _("Restart\342\200\246") : _("Restart")); } @@ -515,9 +514,7 @@ build_session_menuitems (SessionMenuMgr* mgr) g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_hibernate), mgr); - mi = mgr->restart_mi = dbusmenu_menuitem_new (); - mi_set_type (mi, RESTART_ITEM_TYPE); - dbusmenu_menuitem_property_set (mi, RESTART_ITEM_LABEL, _("Restart\342\200\246")); + mi = mgr->restart_mi = mi_new (_("Restart\342\200\246")); dbusmenu_menuitem_child_append (mgr->top_mi, mi); g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(action_func_spawn_async), CMD_RESTART); |