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

[Viko Adi Rahmawan]

call gnome screensaver's lock on pantheon

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2015-02-05 22:38:46 +0000
+++ src/backend-dbus/actions.c	2015-03-24 17:50:02 +0000
@@ -883,7 +883,9 @@
 {
   priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
 
-  if (is_owned_proxy (p->unity_session))
+  // testing against unity_session isn't enough for other session (pantheon)
+  // so we check if we have gnome screensaver too
+  if (is_owned_proxy (p->unity_session) && p->screen_saver == NULL)
     {
       if (immediate)
         {