diff options
| author | Marc Deslauriers <marc.deslauriers@canonical.com> | 2013-09-25 18:23:58 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-09-25 18:23:58 +0000 |
| commit | 1a2e1d7719d699308ac22a05127b45f2248a3516 (patch) | |
| tree | f26c67cc00ae600d6647dadcecfd218d3dd7c071 /src | |
| parent | b7a8f35077f950dc6dab640e759341c1c2476f5c (diff) | |
| parent | 7b020f0a6e02172cfbb0196607ad86b477d30ad2 (diff) | |
| download | ayatana-indicator-session-1a2e1d7719d699308ac22a05127b45f2248a3516.tar.gz ayatana-indicator-session-1a2e1d7719d699308ac22a05127b45f2248a3516.tar.bz2 ayatana-indicator-session-1a2e1d7719d699308ac22a05127b45f2248a3516.zip | |
* 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)
. Fixes: https://bugs.launchpad.net/bugs/1220201.
Approved by PS Jenkins bot, Charles Kerr.
Diffstat (limited to 'src')
| -rw-r--r-- | src/service.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/service.c b/src/service.c index b7b1ba2..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-greeter"; - 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); |