diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-20 04:04:36 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-20 04:04:36 +0000 |
commit | 7e108c74958ec076a3734822f61f145d0d69547f (patch) | |
tree | 5af7d8df8a09ee699544a24ce149876c1cdee06e /community/cinnamon-screensaver | |
parent | 8640bbf496b9d8a232da91e1db43466797f86861 (diff) |
Thu Mar 20 04:00:11 UTC 2014
Diffstat (limited to 'community/cinnamon-screensaver')
-rw-r--r-- | community/cinnamon-screensaver/PKGBUILD | 11 | ||||
-rw-r--r-- | community/cinnamon-screensaver/lock_screen_on_suspend.patch | 51 |
2 files changed, 3 insertions, 59 deletions
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index a58fa0bfe..a89b7ce9c 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -5,7 +5,7 @@ pkgname=cinnamon-screensaver pkgver=2.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64') license=('GPL') @@ -16,13 +16,11 @@ makedepends=('intltool' 'gnome-common') source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz cinnamon-screensaver.pam away-message-fixes.patch - fix-systemd-lock.patch - lock_screen_on_suspend.patch) + fix-systemd-lock.patch) sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' 'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96' - '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c' - '54f281eeb0e97c8c46250e287719051e0a580f6c0de384760aaa3532b42616f1') + '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c') prepare() { cd $pkgname-$pkgver @@ -32,9 +30,6 @@ prepare() { # Use the session path instead of the session id patch -Np1 -i ../fix-systemd-lock.patch - - # Lock screen on suspend with systemd - patch -Np1 -i ../lock_screen_on_suspend.patch } build() { diff --git a/community/cinnamon-screensaver/lock_screen_on_suspend.patch b/community/cinnamon-screensaver/lock_screen_on_suspend.patch deleted file mode 100644 index a6019a503..000000000 --- a/community/cinnamon-screensaver/lock_screen_on_suspend.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martinpitt@gnome.org> -Date: Wed, 1 May 2013 10:55:49 -0700 -Subject: [PATCH] Lock screen on suspend - -Listen for logind's PrepareForSleep signal, and lock the screen (if configured -to do so). This mirrors what gnome-shell's screensaver does. ---- - src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++ - src/gs-listener-dbus.h | 1 + - src/gs-monitor.c | 20 ++++++++++++++++++++ - 3 files changed, 49 insertions(+) - -diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c -index 7f718fa..49586fd 100644 ---- a/src/gs-listener-dbus.c -+++ b/src/gs-listener-dbus.c -@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection, - } - - return DBUS_HANDLER_RESULT_HANDLED; -+ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) { -+ gboolean active; -+ if (dbus_message_get_args (message, NULL, -+ DBUS_TYPE_BOOLEAN, &active, -+ DBUS_TYPE_INVALID) && active) { -+ gs_debug ("systemd notified that system is about to sleep"); -+ g_signal_emit (listener, signals [LOCK], 0, ""); -+ } else { -+ gs_debug ("cannot parse PrepareForSleep"); -+ } -+ return DBUS_HANDLER_RESULT_HANDLED; - } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) { - - if (_listener_message_path_is_our_session (listener, message)) { -@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener, - ",interface='"DBUS_INTERFACE_PROPERTIES"'" - ",member='PropertiesChanged'", - NULL); -+ dbus_bus_add_match (listener->priv->system_connection, -+ "type='signal'" -+ ",sender='"SYSTEMD_LOGIND_SERVICE"'" -+ ",interface='"SYSTEMD_LOGIND_INTERFACE"'" -+ ",member='PrepareForSleep'", -+ NULL); - - return (res != -1); - } --- -1.8.1.2 - |