Merge lp:~josharenson/indicator-session/clarify-options into lp:indicator-session

[Josh Arenson]

Show the greeter when "Lock/Siwtch Users" is clicked

This is instead of only showing the lockscreen

Show the greeter when "Lock/Siwtch Users" is clicked

This is instead of only showing the lockscreen. The inactivity timeout and Lock key-combo still trigger the internal lockscreen, but since the lockscreen can't switch users, this patch shows the actual greeter when "Lock/Switch Users" is clicked.

* Ensure the project compiles and the test suite executes without error
   The tests segfault, but they do on trunk as well

* Ensure that non-obvious code has comments explaining it
N/A

* If the change works on specific profiles, please include those in the merge description.
N/A

[Lukáš Tinkl (lukas-kde)]

I'm curious as to why the tests are not running here (segfaulting?) Worth investigating maybe

review: Needs Information

[Josh Arenson (josharenson)]

> I'm curious as to why the tests are not running here (segfaulting?) Worth
> investigating maybe

I'd be happy to take a look :-)

[Josh Arenson (josharenson)]

Got around to this today and the tests seem fine now (up to date zesty).

Unmerged revisions

480. By Josh Arenson on 2017-02-07

Show the greeter when "Lock/Siwtch Users" is clicked

This is instead of only showing the lockscreen

=== modified file 'src/service.c'
--- src/service.c	2016-11-10 22:36:35 +0000
+++ src/service.c	2017-02-08 00:20:31 +0000
@@ -693,7 +693,7 @@
     }
   else
     {
-      const char * lock_switch_action = "indicator.switch-to-screensaver";
+      const char * lock_switch_action = "indicator.switch-to-greeter";
       const char * switch_action = "indicator.switch-to-greeter";
 
       if (g_hash_table_size (p->users) > 1 &&