Update python scripts, no longer conflicts gnome-screensaver (which ceased to exist) or light-locker (I think; at least Pantheon's dependency on it is gone anyway), fix longstanding bugs

6 files changed, 29 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b03a07868d9..a6628c9931c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,23 @@
 pkgbase = xscreensaver-dbus-screenlock
-	pkgdesc = DE neutral integrated screen-locking with xscreensaver
-	pkgver = 4
+	pkgdesc = DE integrated screen-locking with xscreensaver
+	pkgver = 5
 	pkgrel = 1
 	url = http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL
 	depends = xscreensaver
 	depends = python
 	depends = dbus
-	optdepends = indicator-session: Activate "Lock" from indicator
-	provides = gnome-screensaver
-	provides = light-locker
-	conflicts = gnome-screensaver
-	conflicts = light-locker
 	source = xscreensaver-dbus-screenlock-freedesktop.py
 	source = xscreensaver-dbus-screenlock-gnome.py
 	source = org.freedesktop.ScreenSaver.service
 	source = org.gnome.ScreenSaver.service
 	source = xscreensaver-dbus-screenlock-freedesktop.desktop
 	source = xscreensaver-dbus-screenlock-gnome.desktop
-	source = apps.light-locker.gschema.xml
-	md5sums = c7d3d86def974e678f62f5c778e3abfb
-	md5sums = a6888ae261adddb56d5ebffbe5487dc7
-	md5sums = 9181f92d592549c5506a9722b47b7e94
+	md5sums = 9b052558e59944a66d4174a723c99011
+	md5sums = 77fe4529da9a081f617c8be07b8c8ee7
 	md5sums = 9181f92d592549c5506a9722b47b7e94
+	md5sums = 8802e2b10232e39fe98b8c6e7228c83a
 	md5sums = 65a7fb8a4d3e8183009e9caffc3e587a
 	md5sums = 90ebf9aabc89691dd20f70c78506daea
 	md5sums = 599874ebe25e03cbf95812ea8a6e8f25
diff --git a/PKGBUILD b/PKGBUILD
index 6d20831be8f0..a653b638cae0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,32 @@
 # Maintainer: Que Quotion <quequotion@bugmenot.com>
-
 pkgname=xscreensaver-dbus-screenlock
-pkgver=4
+pkgver=5
 pkgrel=1
-pkgdesc="DE neutral integrated screen-locking with xscreensaver"
-arch=('i686' 'x86_64')
+pkgdesc="DE integrated screen-locking with xscreensaver"
+arch=('any')
 url="http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175"
 license=('GPL')
 depends=('xscreensaver' 'python' 'dbus')
-optdepends=('indicator-session: Activate "Lock" from indicator')
-provides=('gnome-screensaver' 'light-locker')
-conflicts=('gnome-screensaver' 'light-locker')
 source=(xscreensaver-dbus-screenlock-{freedesktop,gnome}.py
         org.{freedesktop,gnome}.ScreenSaver.service
-        xscreensaver-dbus-screenlock-{freedesktop,gnome}.desktop
-        'apps.light-locker.gschema.xml')
-md5sums=('c7d3d86def974e678f62f5c778e3abfb'
-         'a6888ae261adddb56d5ebffbe5487dc7'
-         '9181f92d592549c5506a9722b47b7e94'
+        xscreensaver-dbus-screenlock-{freedesktop,gnome}.desktop)
+md5sums=('9b052558e59944a66d4174a723c99011'
+         '77fe4529da9a081f617c8be07b8c8ee7'
          '9181f92d592549c5506a9722b47b7e94'
+         '8802e2b10232e39fe98b8c6e7228c83a'
          '65a7fb8a4d3e8183009e9caffc3e587a'
          '90ebf9aabc89691dd20f70c78506daea'
          '599874ebe25e03cbf95812ea8a6e8f25')
-
 package() {
-
   #Python scripts
-  install -Ddm755 "${pkgdir}/usr/bin"
-  install -Dm755 {${srcdir}/xscreensaver-dbus-screenlock-{freedesktop,gnome}.py,${pkgdir}/usr/bin/}
+  install -Dm755 {${srcdir},${pkgdir}/usr/bin}/xscreensaver-dbus-screenlock-freedesktop.py
+  install -Dm755 {${srcdir},${pkgdir}/usr/bin}/xscreensaver-dbus-screenlock-gnome.py
 
   #Dbus services
-  install -Ddm755 "${pkgdir}/usr/share/dbus-1/services"
-  install -Dm644 {${srcdir}/org.{freedesktop,gnome}.ScreenSaver.service,${pkgdir}/usr/share/dbus-1/services/}
+  install -Dm644 {${srcdir},${pkgdir}/usr/share/dbus-1/services}/org.freedesktop.ScreenSaver.service
+  install -Dm644 {${srcdir},${pkgdir}/usr/share/dbus-1/services}/org.gnome.ScreenSaver.service
 
   #XDG Startups
-  install -Ddm755 "${pkgdir}/etc/xdg/autostart"
-  install -Dm644 {${srcdir}/xscreensaver-dbus-screenlock-{freedesktop,gnome}.desktop,${pkgdir}/etc/xdg/autostart/}
-
-  #Gconf Schemas (for dependencies)
-  install -Dm644 {${srcdir},${pkgdir}/usr/share/glib-2.0/schemas}/apps.light-locker.gschema.xml
-
-  # Redirect stray calls to xscreensaver-command
-  #install -Ddm755 "${pkgdir}/usr/bin/"
-  #ln -s /usr/bin/xscreensaver-command "${pkgdir}/usr/bin/gnome-screensaver-command"
-  #ln -s /usr/bin/xscreensaver-command "${pkgdir}/usr/bin/light-locker-command"
+  install -Dm644 {${srcdir},${pkgdir}/etc/xdg/autostart}/xscreensaver-dbus-screenlock-freedesktop.desktop
+  install -Dm644 {${srcdir},${pkgdir}/etc/xdg/autostart}/xscreensaver-dbus-screenlock-gnome.desktop
 }
-
diff --git a/apps.light-locker.gschema.xml b/apps.light-locker.gschema.xml
deleted file mode 100644
index ccdf9453845f..000000000000
--- a/apps.light-locker.gschema.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="light-locker">
-
-  <schema path="/apps/light-locker/" id="apps.light-locker">
-
-    <key type="b" name="lock-on-suspend">
-      <default>true</default>
-      <summary>Lock on Suspend</summary>
-      <description>Lock the screen when the computer is suspended.</description>
-    </key>
-
-    <key type="b" name="late-locking">
-      <default>false</default>
-      <summary>Lock after screensaver ends</summary>
-      <description>Lock after screensaver has ended.</description>
-    </key>
-
-    <key type="u" name="lock-after-screensaver">
-      <range min="0" max="3600"/>
-      <default>5</default>
-      <summary>Seconds after screensaver to lock</summary>
-      <description>Lock the screen after the screensaver has been active for
-      this number of seconds. If 0, locking after the screensaver is
-      disabled.</description>
-    </key>
-
-    <key type="b" name="lock-on-lid">
-      <default>false</default>
-      <summary>Lock on lid close</summary>
-      <description>Lock the screen when lid of the computer is closed.</description>
-    </key>
-
-    <key type="b" name="idle-hint">
-      <default>false</default>
-      <summary>Set idle hint during screensaver</summary>
-      <description>Set the session idle hint while the screensaver is active.
-      </description>
-    </key>
-
-
-  </schema>
-</schemalist>
diff --git a/org.gnome.ScreenSaver.service b/org.gnome.ScreenSaver.service
index 76ab86d1f680..691c248f873f 100644
--- a/org.gnome.ScreenSaver.service
+++ b/org.gnome.ScreenSaver.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.ScreenSaver
-Exec=/usr/bin/xscreensaver-dbus-screenlock-freedesktop.py
+Name=org.gnome.ScreenSaver
+Exec=/usr/bin/xscreensaver-dbus-screenlock-gnome.py
diff --git a/xscreensaver-dbus-screenlock-freedesktop.py b/xscreensaver-dbus-screenlock-freedesktop.py
index 126b35151dcf..2a670b28c54e 100644
--- a/xscreensaver-dbus-screenlock-freedesktop.py
+++ b/xscreensaver-dbus-screenlock-freedesktop.py
@@ -1,28 +1,24 @@
 #!/usr/bin/env python2
-# Replace gnome-screensaver or light-locker DBus service to call xscreensaver
+# Provide DBus service to call xscreensaver
 # http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175
 
 import dbus
 import dbus.service
 import dbus.glib
-import gobject
+from gi.repository import GObject
 import subprocess
 
 class ScreenDbusObj(dbus.service.Object):
     def __init__(self):
         session_bus = dbus.SessionBus()
         bus_name=dbus.service.BusName("org.freedesktop.ScreenSaver",bus=session_bus)
-        #bus_name=dbus.service.BusName("org.gnome.ScreenSaver",bus=session_bus)
         dbus.service.Object.__init__(self,bus_name, '/org/freedesktop/ScreenSaver')
-        #dbus.service.Object.__init__(self,bus_name, '/org/gnome/ScreenSaver')
-
 
     @dbus.service.method("org.freedesktop.ScreenSaver")
-    #@dbus.service.method("org.gnome.ScreenSaver")
     def Lock(self):
         subprocess.Popen(['xscreensaver-command', '-lock'])
 
-
 if __name__ == '__main__':
     object=ScreenDbusObj()
-    gobject.MainLoop().run()
+    GObject.MainLoop().run()
+
diff --git a/xscreensaver-dbus-screenlock-gnome.py b/xscreensaver-dbus-screenlock-gnome.py
index 8388d87865f5..77a3337eb1f9 100644
--- a/xscreensaver-dbus-screenlock-gnome.py
+++ b/xscreensaver-dbus-screenlock-gnome.py
@@ -1,28 +1,24 @@
 #!/usr/bin/env python2
-# Replace gnome-screensaver or light-locker DBus service to call xscreensaver
+# Provide DBus service to call xscreensaver
 # http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175
 
 import dbus
 import dbus.service
 import dbus.glib
-import gobject
+from gi.repository import GObject
 import subprocess
 
 class ScreenDbusObj(dbus.service.Object):
     def __init__(self):
         session_bus = dbus.SessionBus()
-        #bus_name=dbus.service.BusName("org.freedesktop.ScreenSaver",bus=session_bus)
         bus_name=dbus.service.BusName("org.gnome.ScreenSaver",bus=session_bus)
-        #dbus.service.Object.__init__(self,bus_name, '/org/freedesktop/ScreenSaver')
         dbus.service.Object.__init__(self,bus_name, '/org/gnome/ScreenSaver')
 
-
-    #@dbus.service.method("org.freedesktop.ScreenSaver")
     @dbus.service.method("org.gnome.ScreenSaver")
     def Lock(self):
         subprocess.Popen(['xscreensaver-command', '-lock'])
 
-
 if __name__ == '__main__':
     object=ScreenDbusObj()
-    gobject.MainLoop().run()
+    GObject.MainLoop().run()
+