Merge lp:~fferrai/elementaryos/fix-locking into lp:~elementary-os/elementaryos/os-patch-indicator-session-trusty-old

[Fabrizio Ferrai]

Fix locking, by adding a python script that emulates a dbus interface for light-locker.

[lp:~fferrai/elementaryos/fix-locking]

5. By Fabrizio Ferrai on 2014-08-13

Add dependencies and conflicts.

[Cody Garver (codygarver)]

create debian/postinst that contains the symlink command

[lp:~fferrai/elementaryos/fix-locking]

6. By Fabrizio Ferrai on 2014-08-13

Add symlink to implement gnome-screensaver-command functionality.

[Cameron Norman (cameronnemo)]

This seems unnecessarily roundabout. Why not just run the light-locker-command from where the gnome-screensaver lock command is issued? That would work on light-locker and gnome-screensaver systems alike. The C code would look like so:

if (system("light-locker-command -l")) {
    /* On a light-locker system, and we just locked it */
} else {
    /* On a gnome-screensaver system */
    /* do gnome-screensaver stuff that was done previously */
}

I could put together something tomorrow if you guys think it is a better/simpler idea. Maybe if I actually called the dbus interface directly instead of went through light-locker-command, I could get something suitable for upstream inclusion, but I do not really like GObject C (which I would need to use for gdbus), so I can not say that I will be able to do it soon (however the logic and architecture would be the same).

[Cameron Norman (cameronnemo)]

I should clarify that I am talking about adding a little code to the actual indicator-session source.

[Cody Garver (codygarver)]

Cameron, that's exactly what we need. I just imported light-locker 1.5 to Freya and it "Added DBus interface to communicate with the running light-locker", so that would be perfect.

Unmerged revisions

6. By Fabrizio Ferrai on 2014-08-13

Add symlink to implement gnome-screensaver-command functionality.

5. By Fabrizio Ferrai on 2014-08-13

Add dependencies and conflicts.

4. By Fabrizio Ferrai on 2014-08-13

Fix the locking wiring between gnome screensaver and light-locker
with a python middleware that emulates a dbus light-locker interface.

=== modified file 'debian/control'
--- debian/control	2014-04-03 17:08:08 +0000
+++ debian/control	2014-08-13 21:41:46 +0000
@@ -26,6 +26,9 @@
          systemd-services,
          gnome-settings-daemon-schemas,
          gsettings-desktop-schemas,
+         python,
+         light-locker,
+         dbus,
 Recommends: indicator-applet (>= 0.2) | indicator-renderer,
             gnome-screensaver,
             yelp,
@@ -33,6 +36,7 @@
             unity-control-center-signon | gnome-control-center-signon
 Suggests: lightdm,
           zenity
+Conflicts: gnome-screensaver
 Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and
  give the user easy control for changing their instant message status.  
 
=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2014-08-13 21:41:46 +0000
@@ -0,0 +1,2 @@
+light-locker-dbus-screenlock/light-locker-dbus-screenlock.py /usr/bin/
+light-locker-dbus-screenlock/light-locker-dbus-screenlock.desktop /etc/xdg/autostart/
 \ No newline at end of file
 
=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2014-08-13 21:41:46 +0000
@@ -0,0 +1,1 @@
+ln -s /usr/bin/light-locker-command /usr/bin/gnome-screensaver-command
 \ No newline at end of file
 
=== added directory 'light-locker-dbus-screenlock'
=== added file 'light-locker-dbus-screenlock/light-locker-dbus-screenlock.desktop'
--- light-locker-dbus-screenlock/light-locker-dbus-screenlock.desktop	1970-01-01 00:00:00 +0000
+++ light-locker-dbus-screenlock/light-locker-dbus-screenlock.desktop	2014-08-13 21:41:46 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Light-locker DBus Screenlock
+Comment=Replace gnome-screensaver DBus service to call light-locker
+TryExec=light-locker-dbus-screenlock.py
+Exec=light-locker-dbus-screenlock.py
+NotShownIn=Gnome;Unity
 \ No newline at end of file
 
=== added file 'light-locker-dbus-screenlock/light-locker-dbus-screenlock.py'
--- light-locker-dbus-screenlock/light-locker-dbus-screenlock.py	1970-01-01 00:00:00 +0000
+++ light-locker-dbus-screenlock/light-locker-dbus-screenlock.py	2014-08-13 21:41:46 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# Replace gnome-screensaver DBus service to call light-locker
+# http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175
+
+import dbus
+import dbus.service
+import dbus.glib
+import gobject
+import subprocess
+
+class ScreenDbusObj(dbus.service.Object):
+    def __init__(self):
+        session_bus = dbus.SessionBus()
+        bus_name=dbus.service.BusName("org.gnome.ScreenSaver",bus=session_bus)
+        dbus.service.Object.__init__(self,bus_name, '/org/gnome/ScreenSaver')
+    
+    @dbus.service.method("org.gnome.ScreenSaver")
+    def Lock(self):
+        subprocess.Popen(['light-locker-command', '-l'])
+
+if __name__ == '__main__':
+    object=ScreenDbusObj()
+    gobject.MainLoop().run()
 \ No newline at end of file