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

Proposed by Josh Arenson
Status: Needs review
Proposed branch: lp://staging/~josharenson/indicator-session/clarify-options
Merge into: lp://staging/indicator-session
Diff against target: 12 lines (+1/-1)
1 file modified
src/service.c (+1/-1)
To merge this branch: bzr merge lp://staging/~josharenson/indicator-session/clarify-options
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Needs Information
Review via email: mp+316659@code.staging.launchpad.net

Commit message

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

This is instead of only showing the lockscreen

Description of the change

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

To post a comment you must log in.
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

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

review: Needs Information
Revision history for this message
Josh Arenson (josharenson) wrote :

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

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

Revision history for this message
Josh Arenson (josharenson) wrote :

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

Unmerged revisions

480. By Josh Arenson

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

This is instead of only showing the lockscreen

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches