summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2015-11-16 07:07:19 +0900
committerQue Quotion2015-11-16 07:07:19 +0900
commit1cdd3fb2cee0c6c55251f6130be57634bf4a3bc7 (patch)
tree7b22c3e4eabcb6c779cd964e8de93a6eb4ee6ef1
parentf80fd0e76a710d4d20b1954d7770c776aec86b1f (diff)
downloadaur-1cdd3fb2cee0c6c55251f6130be57634bf4a3bc7.tar.gz
Switched to org.freedesktop.ScreenSaver, emulating light-locker
for Pantheon. Note: the "Lock" button does not work because it's checking for light-locker's user switching service to activate. Hotkey should work!
-rw-r--r--PKGBUILD6
-rw-r--r--xscreensaver-dbus-screenlock.py18
2 files changed, 14 insertions, 10 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5b316279d534..5ba65162563a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgname=xscreensaver-dbus-screenlock
pkgver=1
-pkgrel=2
-pkgdesc="Emulate gnome-screensaver's dbus for integrated screen-locking in gnome-derivatives"
+pkgrel=3
+pkgdesc="Emulate org.freedesktop.screensaver dbus for integrated screen-locking"
arch=('i686' 'x86_64')
url="http://ubuntuforums.org/showthread.php?t=1865593&s=1c7f28c50a3f258e1d3404e41f098a0b&p=11418175#post11418175"
license=('GPL')
@@ -24,7 +24,7 @@ package() {
fi
# This startup script runs in user sesssions with user permissions.
- # Because dbus sessions are exclusive, both gnome-session and indicator session expect this.
+ # Because dbus sessions are exclusive, both gnome-session and indicator-session expect this.
# It might be more secure to run the process as root, but users would be locked out of sessions!
# Regardless, gnome-screensaver works just the same way so whatever...
install -Dm644 {${srcdir},${pkgdir}/etc/xdg/autostart}/xscreensaver-dbus-screenlock.desktop
diff --git a/xscreensaver-dbus-screenlock.py b/xscreensaver-dbus-screenlock.py
index 7bf1daf97363..108c0b4259a3 100644
--- a/xscreensaver-dbus-screenlock.py
+++ b/xscreensaver-dbus-screenlock.py
@@ -7,18 +7,22 @@ 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")
+ 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()