aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Deslauriers <marc.deslauriers@canonical.com>2013-09-20 14:30:14 -0400
committerMarc Deslauriers <marc.deslauriers@canonical.com>2013-09-20 14:30:14 -0400
commitb2bbe57b420407c26ab470a797da55ca8ea17b6d (patch)
tree17a0a6ba4d8db872909f5f6faae87e3d03f1d8d7
parentb7a8f35077f950dc6dab640e759341c1c2476f5c (diff)
downloadayatana-indicator-session-b2bbe57b420407c26ab470a797da55ca8ea17b6d.tar.gz
ayatana-indicator-session-b2bbe57b420407c26ab470a797da55ca8ea17b6d.tar.bz2
ayatana-indicator-session-b2bbe57b420407c26ab470a797da55ca8ea17b6d.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)
-rw-r--r--debian/changelog8
-rw-r--r--src/service.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d4f1a25..8c5255c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-session (12.10.5+13.10.20130823-0ubuntu2) UNRELEASED; urgency=low
+
+ * 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)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Fri, 20 Sep 2013 14:28:32 -0400
+
indicator-session (12.10.5+13.10.20130823-0ubuntu1) saucy; urgency=low
[ Charles Kerr ]
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