elementary OS

Merge lp:~vikoadi/elementaryos/os-patch-indicator-session-trusty-fix-lock into lp:~elementary-os/elementaryos/os-patch-indicator-session-trusty

  1. os-patch-indicator-session-trusty-fix-lock
  2. Merge into os-patch-indicator-session...
Proposed by Viko Adi Rahmawan
Status: Merged
Merged at revision: 8
Proposed branch: lp:~vikoadi/elementaryos/os-patch-indicator-session-trusty-fix-lock
Merge into: lp:~elementary-os/elementaryos/os-patch-indicator-session-trusty
Diff against target: 14 lines (+3/-1)
1 file modified
src/backend-dbus/actions.c (+3/-1)
To merge this branch: bzr merge lp:~vikoadi/elementaryos/os-patch-indicator-session-trusty-fix-lock
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+253986@code.launchpad.net

Description of the change

call gnome screensaver's lock on pantheon

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/backend-dbus/actions.c'
2--- src/backend-dbus/actions.c 2015-02-05 22:38:46 +0000
3+++ src/backend-dbus/actions.c 2015-03-24 17:50:02 +0000
4@@ -883,7 +883,9 @@
5 {
6 priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
7
8- if (is_owned_proxy (p->unity_session))
9+ // testing against unity_session isn't enough for other session (pantheon)
10+ // so we check if we have gnome screensaver too
11+ if (is_owned_proxy (p->unity_session) && p->screen_saver == NULL)
12 {
13 if (immediate)
14 {

Subscribers

People subscribed via source and target branches

to all changes: