From 951592e1349e863b721ca32273577e6f1b517d13 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 26 Jun 2013 11:40:14 -0500 Subject: fix regression that displayed the 'restart' button even when prompting was enabled and the user was running Unity --- src/service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.c b/src/service.c index 7f90c9c..d8fc961 100644 --- a/src/service.c +++ b/src/service.c @@ -539,7 +539,9 @@ create_session_section (IndicatorSessionService * self) if (indicator_session_actions_can_hibernate (p->backend_actions)) g_menu_append (menu, _("Hibernate"), "indicator.hibernate"); - if (!g_settings_get_boolean (s, "suppress-restart-menuitem")) + /* NB: check 'ellipsis' here to skip this item if prompting is enabled + because this shows the same prompt as 'Shut Down' in Unity */ + if (!ellipsis && !g_settings_get_boolean (s, "suppress-restart-menuitem")) { const char * label = ellipsis ? _("Restart\342\200\246") : _("Restart"); g_menu_append (menu, label, "indicator.reboot"); -- cgit v1.2.3