From b2bbe57b420407c26ab470a797da55ca8ea17b6d Mon Sep 17 00:00:00 2001 From: Marc Deslauriers Date: Fri, 20 Sep 2013 14:30:14 -0400 Subject: src/service.c: don't switch to greeter when locking screen, as that switches away from the user's audio, power preferences, etc. (LP: #1220201) --- src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.c b/src/service.c index b7b1ba2..ca0c175 100644 --- a/src/service.c +++ b/src/service.c @@ -466,7 +466,7 @@ create_switch_section (IndicatorSessionService * self) } else if (g_hash_table_size (p->users) == 1) { - const char * action = "indicator.switch-to-greeter"; + const char * action = "indicator.switch-to-screensaver"; item = g_menu_item_new (_("Lock"), action); } else -- cgit v1.2.3 From d06fba55214a2be1739d8ba993d10c1347dfafd4 Mon Sep 17 00:00:00 2001 From: Marc Deslauriers Date: Wed, 25 Sep 2013 11:08:31 -0400 Subject: src/service.c: also switch to screensaver if there is more than one user --- src/service.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/service.c b/src/service.c index ca0c175..efcb04f 100644 --- a/src/service.c +++ b/src/service.c @@ -464,16 +464,15 @@ create_switch_section (IndicatorSessionService * self) item = g_menu_item_new (ellipsis ? _("Switch Account…") : _("Switch Account"), action); } - else if (g_hash_table_size (p->users) == 1) - { - const char * action = "indicator.switch-to-screensaver"; - item = g_menu_item_new (_("Lock"), action); - } else { - const char * action = "indicator.switch-to-greeter"; - item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…") - : _("Lock/Switch Account"), action); + const char * action = "indicator.switch-to-screensaver"; + + if (g_hash_table_size (p->users) == 1) + item = g_menu_item_new (_("Lock"), action); + else + item = g_menu_item_new (ellipsis ? _("Lock/Switch Account…") + : _("Lock/Switch Account"), action); } str = g_settings_get_string (p->keybinding_settings, "screensaver"); g_menu_item_set_attribute (item, "accel", "s", str); -- cgit v1.2.3