Date: Friday, September 27, 2013 @ 19:35:19
Author: bgyorgy
Revision: 97701
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
cinnamon-screensaver/repos/community-staging-i686/
cinnamon-screensaver/repos/community-staging-i686/PKGBUILD
(from rev 97700, cinnamon-screensaver/trunk/PKGBUILD)
cinnamon-screensaver/repos/community-staging-i686/cinnamon-screensaver.pam
(from rev 97700, cinnamon-screensaver/trunk/cinnamon-screensaver.pam)
cinnamon-screensaver/repos/community-staging-i686/fix-dbus-compatibility.patch
(from rev 97700, cinnamon-screensaver/trunk/fix-dbus-compatibility.patch)
cinnamon-screensaver/repos/community-staging-i686/lock_screen_on_suspend.patch
(from rev 97700, cinnamon-screensaver/trunk/lock_screen_on_suspend.patch)
cinnamon-screensaver/repos/community-staging-x86_64/
cinnamon-screensaver/repos/community-staging-x86_64/PKGBUILD
(from rev 97700, cinnamon-screensaver/trunk/PKGBUILD)
cinnamon-screensaver/repos/community-staging-x86_64/cinnamon-screensaver.pam
(from rev 97700, cinnamon-screensaver/trunk/cinnamon-screensaver.pam)
cinnamon-screensaver/repos/community-staging-x86_64/fix-dbus-compatibility.patch
(from rev 97700, cinnamon-screensaver/trunk/fix-dbus-compatibility.patch)
cinnamon-screensaver/repos/community-staging-x86_64/lock_screen_on_suspend.patch
(from rev 97700, cinnamon-screensaver/trunk/lock_screen_on_suspend.patch)
-------------------------------------------------------+
community-staging-i686/PKGBUILD | 63 ++++++
community-staging-i686/cinnamon-screensaver.pam | 3
community-staging-i686/fix-dbus-compatibility.patch | 149 ++++++++++++++++
community-staging-i686/lock_screen_on_suspend.patch | 51 +++++
community-staging-x86_64/PKGBUILD | 63 ++++++
community-staging-x86_64/cinnamon-screensaver.pam | 3
community-staging-x86_64/fix-dbus-compatibility.patch | 149 ++++++++++++++++
community-staging-x86_64/lock_screen_on_suspend.patch | 51 +++++
8 files changed, 532 insertions(+)
Copied: cinnamon-screensaver/repos/community-staging-i686/PKGBUILD (from rev
97700, cinnamon-screensaver/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-09-27 17:35:19 UTC (rev 97701)
@@ -0,0 +1,63 @@
+# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
+# Based on gnome-screensaver package:
+# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Jan de Groot <j...@archlinux.org>
+
+pkgname=cinnamon-screensaver
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
+arch=('i686' 'x86_64')
+license=('GPL')
+url="https://github.com/linuxmint/cinnamon-screensaver";
+backup=(etc/pam.d/cinnamon-screensaver)
+depends=('cinnamon' 'gnome-screensaver')
+makedepends=('intltool' 'gnome-common')
+options=(!emptydirs)
+source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
+ cinnamon-screensaver.pam
+ fix-dbus-compatibility.patch
+ lock_screen_on_suspend.patch)
+sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
+ 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+ 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
+ '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix compatibility with gnome-screensaver's D-Bus interface and various
fixes
+ patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+
+ # Lock screen on suspend with systemd
+ patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon-screensaver \
+ --localstatedir=/var \
+ --with-mit-ext --with-systemd
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../cinnamon-screensaver.pam
"$pkgdir/etc/pam.d/cinnamon-screensaver"
+
+ # Remove conflicts with gnome-screensaver
+ rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
+
+ # Autostart only in Cinnamon
+ cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
+ "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+ sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \
+ "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop
+ echo 'AutostartCondition=GNOME3 if-session cinnamon' \
+ >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
+ echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \
+ >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+}
Copied:
cinnamon-screensaver/repos/community-staging-i686/cinnamon-screensaver.pam
(from rev 97700, cinnamon-screensaver/trunk/cinnamon-screensaver.pam)
===================================================================
--- community-staging-i686/cinnamon-screensaver.pam
(rev 0)
+++ community-staging-i686/cinnamon-screensaver.pam 2013-09-27 17:35:19 UTC
(rev 97701)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth substack system-login
+-auth optional pam_gnome_keyring.so
Copied:
cinnamon-screensaver/repos/community-staging-i686/fix-dbus-compatibility.patch
(from rev 97700, cinnamon-screensaver/trunk/fix-dbus-compatibility.patch)
===================================================================
--- community-staging-i686/fix-dbus-compatibility.patch
(rev 0)
+++ community-staging-i686/fix-dbus-compatibility.patch 2013-09-27 17:35:19 UTC
(rev 97701)
@@ -0,0 +1,149 @@
+From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Thu, 28 Feb 2013 05:45:12 +0100
+Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's
+ D-Bus interface
+
+---
+ src/cinnamon-screensaver-command.c | 4 ++--
+ src/gs-listener-dbus.c | 10 ++++++++--
+ src/gs-manager.c | 14 +++++++++++---
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/cinnamon-screensaver-command.c
b/src/cinnamon-screensaver-command.c
+index 4267bd0..5c90916 100644
+--- a/src/cinnamon-screensaver-command.c
++++ b/src/cinnamon-screensaver-command.c
+@@ -311,11 +311,11 @@
+
+ if (do_lock) {
+ if (g_strcmp0 (away_message, "DEFAULT") == 0) {
+- reply = screensaver_send_message_string
(connection, "Lock", away_message);
++ reply = screensaver_send_message_string
(connection, "LockMessage", away_message);
+ }
+ else {
+ gchar * custom_message =
g_strdup_printf("CUSTOM###%s", away_message);
+- reply = screensaver_send_message_string
(connection, "Lock", custom_message);
++ reply = screensaver_send_message_string
(connection, "LockMessage", custom_message);
+ g_free (custom_message);
+ }
+ if (reply == NULL) {
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 2a98aee..6dbf12d 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -653,6 +653,8 @@ enum {
+ xml = g_string_append (xml,
+ " <interface name=\""GS_INTERFACE"\">\n"
+ " <method name=\"Lock\">\n"
++ " </method>\n"
++ " <method name=\"LockMessage\">\n"
+ " <arg name=\"body\" direction=\"in\"
type=\"s\"/>\n"
+ " </method>\n"
+ " <method name=\"SimulateUserActivity\">\n"
+@@ -744,6 +746,10 @@ enum {
+ g_return_val_if_fail (message != NULL,
DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+
+ if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
++ g_signal_emit (listener, signals [LOCK], 0);
++ return send_success_reply (connection, message);
++ }
++ if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage"))
{
+ return listener_lock (listener, connection, message);
+ }
+ if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
+@@ -906,7 +912,7 @@ enum {
+ } else if (dbus_message_is_signal (message,
SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
+ if (_listener_message_path_is_our_session (listener,
message)) {
+ gs_debug ("systemd requested session lock");
+- return listener_lock (listener, connection,
message);
++ g_signal_emit (listener, signals [LOCK], 0);
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+@@ -948,7 +954,7 @@ enum {
+ } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE,
"Lock")) {
+ if (_listener_message_path_is_our_session (listener,
message)) {
+ gs_debug ("ConsoleKit requested session lock");
+- return listener_lock (listener, connection, message);
++ g_signal_emit (listener, signals [LOCK], 0);
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+diff --git a/src/gs-manager.c b/src/gs-manager.c
+index 1544921..bc09cb9 100644
+--- a/src/gs-manager.c
++++ b/src/gs-manager.c
+@@ -1275,10 +1275,18 @@ enum {
+ gs_manager_set_away_message (GSManager *manager,
+ const char *message)
+ {
+- g_free (manager->priv->logout_command);
+-
+- manager->priv->away_message = g_strdup(message);
+ GSList *l;
++
++ g_return_if_fail (GS_IS_MANAGER (manager));
++
++ g_free (manager->priv->away_message);
++
++ if (message) {
++ manager->priv->away_message = g_strdup (message);
++ } else {
++ manager->priv->away_message = NULL;
++ }
++
+ for (l = manager->priv->windows; l; l = l->next) {
+ gs_window_set_away_message (l->data,
manager->priv->away_message);
+ }
+--
+1.8.1.6
+
+
+From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Fri, 1 Mar 2013 05:17:46 +0100
+Subject: [PATCH 2/4] Update dbus document with the new LockMessage method
+
+---
+ doc/dbus-interface.html | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html
+index faff26c..c9f95ba 100644
+--- a/doc/dbus-interface.html
++++ b/doc/dbus-interface.html
+@@ -2,6 +2,8 @@
+ ������������<code class="email"><<a class="email"
href="mailto:mcc...@jhu.edu";>mcc...@jhu.edu</a>></code><br>
+ ����������</p></div></div></div></div></div><div><p
class="releaseinfo">Version 1.7.1</p></div></div><hr></div><div
class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a
href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span
class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span
class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#gs-method-Lock">
+ <code class="literal">Lock</code>
++ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-LockMessage">
++ <code class="literal">LockMessage</code>
+ </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+ <code class="literal">Cycle</code>
+ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-SimulateUserActivity">
+@@ -30,6 +32,8 @@
+ <code class="literal">AuthenticationRequestEnd</code>
+ </a></span></dt></dl></dd><dt><span class="sect1"><a
href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div
class="chapter" title="Chapter�1.�DBUS Interface"><div
class="titlepage"><div><div><h2 class="title"><a
name="dbus-interface"></a>Chapter�1.�DBUS Interface</h2></div></div></div><div
class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a
href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a
href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a
href="#gs-method-Lock">
+ <code class="literal">Lock</code>
++ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-LockMessage">
++ <code class="literal">LockMessage</code>
+ </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+ <code class="literal">Cycle</code>
+ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-SimulateUserActivity">
+@@ -70,7 +74,11 @@
+ <code class="literal">Lock</code>
+ </h3></div></div></div><p>
+ Request that the screen be locked.
+- </p></div><div class="sect2" title="Cycle"><div
class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
++ </p></div><div class="sect2" title="LockMessage"><div
class="titlepage"><div><div><h3 class="title"><a
name="gs-method-LockMessage"></a>
++ <code class="literal">LockMessage</code>
++ </h3></div></div></div><p>
++ Request that the screen be locked, and set an away message.
++ </p><div class="informaltable"><table
border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the
away message</td></tr></tbody></table></div></div><div class="sect2"
title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a
name="gs-method-Cycle"></a>
+ <code class="literal">Cycle</code>
+ </h3></div></div></div><p>
+ Request that the screen saver theme be restarted and, if applicable,
+--
+1.8.1.6
+
Copied:
cinnamon-screensaver/repos/community-staging-i686/lock_screen_on_suspend.patch
(from rev 97700, cinnamon-screensaver/trunk/lock_screen_on_suspend.patch)
===================================================================
--- community-staging-i686/lock_screen_on_suspend.patch
(rev 0)
+++ community-staging-i686/lock_screen_on_suspend.patch 2013-09-27 17:35:19 UTC
(rev 97701)
@@ -0,0 +1,51 @@
+From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinp...@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
+
Copied: cinnamon-screensaver/repos/community-staging-x86_64/PKGBUILD (from rev
97700, cinnamon-screensaver/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-09-27 17:35:19 UTC (rev 97701)
@@ -0,0 +1,63 @@
+# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
+# Based on gnome-screensaver package:
+# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Jan de Groot <j...@archlinux.org>
+
+pkgname=cinnamon-screensaver
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
+arch=('i686' 'x86_64')
+license=('GPL')
+url="https://github.com/linuxmint/cinnamon-screensaver";
+backup=(etc/pam.d/cinnamon-screensaver)
+depends=('cinnamon' 'gnome-screensaver')
+makedepends=('intltool' 'gnome-common')
+options=(!emptydirs)
+source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
+ cinnamon-screensaver.pam
+ fix-dbus-compatibility.patch
+ lock_screen_on_suspend.patch)
+sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
+ 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+ 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
+ '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix compatibility with gnome-screensaver's D-Bus interface and various
fixes
+ patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+
+ # Lock screen on suspend with systemd
+ patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon-screensaver \
+ --localstatedir=/var \
+ --with-mit-ext --with-systemd
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../cinnamon-screensaver.pam
"$pkgdir/etc/pam.d/cinnamon-screensaver"
+
+ # Remove conflicts with gnome-screensaver
+ rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
+
+ # Autostart only in Cinnamon
+ cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
+ "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+ sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \
+ "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop
+ echo 'AutostartCondition=GNOME3 if-session cinnamon' \
+ >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
+ echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \
+ >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+}
Copied:
cinnamon-screensaver/repos/community-staging-x86_64/cinnamon-screensaver.pam
(from rev 97700, cinnamon-screensaver/trunk/cinnamon-screensaver.pam)
===================================================================
--- community-staging-x86_64/cinnamon-screensaver.pam
(rev 0)
+++ community-staging-x86_64/cinnamon-screensaver.pam 2013-09-27 17:35:19 UTC
(rev 97701)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth substack system-login
+-auth optional pam_gnome_keyring.so
Copied:
cinnamon-screensaver/repos/community-staging-x86_64/fix-dbus-compatibility.patch
(from rev 97700, cinnamon-screensaver/trunk/fix-dbus-compatibility.patch)
===================================================================
--- community-staging-x86_64/fix-dbus-compatibility.patch
(rev 0)
+++ community-staging-x86_64/fix-dbus-compatibility.patch 2013-09-27
17:35:19 UTC (rev 97701)
@@ -0,0 +1,149 @@
+From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Thu, 28 Feb 2013 05:45:12 +0100
+Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's
+ D-Bus interface
+
+---
+ src/cinnamon-screensaver-command.c | 4 ++--
+ src/gs-listener-dbus.c | 10 ++++++++--
+ src/gs-manager.c | 14 +++++++++++---
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/cinnamon-screensaver-command.c
b/src/cinnamon-screensaver-command.c
+index 4267bd0..5c90916 100644
+--- a/src/cinnamon-screensaver-command.c
++++ b/src/cinnamon-screensaver-command.c
+@@ -311,11 +311,11 @@
+
+ if (do_lock) {
+ if (g_strcmp0 (away_message, "DEFAULT") == 0) {
+- reply = screensaver_send_message_string
(connection, "Lock", away_message);
++ reply = screensaver_send_message_string
(connection, "LockMessage", away_message);
+ }
+ else {
+ gchar * custom_message =
g_strdup_printf("CUSTOM###%s", away_message);
+- reply = screensaver_send_message_string
(connection, "Lock", custom_message);
++ reply = screensaver_send_message_string
(connection, "LockMessage", custom_message);
+ g_free (custom_message);
+ }
+ if (reply == NULL) {
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 2a98aee..6dbf12d 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -653,6 +653,8 @@ enum {
+ xml = g_string_append (xml,
+ " <interface name=\""GS_INTERFACE"\">\n"
+ " <method name=\"Lock\">\n"
++ " </method>\n"
++ " <method name=\"LockMessage\">\n"
+ " <arg name=\"body\" direction=\"in\"
type=\"s\"/>\n"
+ " </method>\n"
+ " <method name=\"SimulateUserActivity\">\n"
+@@ -744,6 +746,10 @@ enum {
+ g_return_val_if_fail (message != NULL,
DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+
+ if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
++ g_signal_emit (listener, signals [LOCK], 0);
++ return send_success_reply (connection, message);
++ }
++ if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage"))
{
+ return listener_lock (listener, connection, message);
+ }
+ if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
+@@ -906,7 +912,7 @@ enum {
+ } else if (dbus_message_is_signal (message,
SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
+ if (_listener_message_path_is_our_session (listener,
message)) {
+ gs_debug ("systemd requested session lock");
+- return listener_lock (listener, connection,
message);
++ g_signal_emit (listener, signals [LOCK], 0);
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+@@ -948,7 +954,7 @@ enum {
+ } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE,
"Lock")) {
+ if (_listener_message_path_is_our_session (listener,
message)) {
+ gs_debug ("ConsoleKit requested session lock");
+- return listener_lock (listener, connection, message);
++ g_signal_emit (listener, signals [LOCK], 0);
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+diff --git a/src/gs-manager.c b/src/gs-manager.c
+index 1544921..bc09cb9 100644
+--- a/src/gs-manager.c
++++ b/src/gs-manager.c
+@@ -1275,10 +1275,18 @@ enum {
+ gs_manager_set_away_message (GSManager *manager,
+ const char *message)
+ {
+- g_free (manager->priv->logout_command);
+-
+- manager->priv->away_message = g_strdup(message);
+ GSList *l;
++
++ g_return_if_fail (GS_IS_MANAGER (manager));
++
++ g_free (manager->priv->away_message);
++
++ if (message) {
++ manager->priv->away_message = g_strdup (message);
++ } else {
++ manager->priv->away_message = NULL;
++ }
++
+ for (l = manager->priv->windows; l; l = l->next) {
+ gs_window_set_away_message (l->data,
manager->priv->away_message);
+ }
+--
+1.8.1.6
+
+
+From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Fri, 1 Mar 2013 05:17:46 +0100
+Subject: [PATCH 2/4] Update dbus document with the new LockMessage method
+
+---
+ doc/dbus-interface.html | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html
+index faff26c..c9f95ba 100644
+--- a/doc/dbus-interface.html
++++ b/doc/dbus-interface.html
+@@ -2,6 +2,8 @@
+ ������������<code class="email"><<a class="email"
href="mailto:mcc...@jhu.edu";>mcc...@jhu.edu</a>></code><br>
+ ����������</p></div></div></div></div></div><div><p
class="releaseinfo">Version 1.7.1</p></div></div><hr></div><div
class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a
href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span
class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span
class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span
class="sect2"><a href="#gs-method-Lock">
+ <code class="literal">Lock</code>
++ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-LockMessage">
++ <code class="literal">LockMessage</code>
+ </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+ <code class="literal">Cycle</code>
+ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-SimulateUserActivity">
+@@ -30,6 +32,8 @@
+ <code class="literal">AuthenticationRequestEnd</code>
+ </a></span></dt></dl></dd><dt><span class="sect1"><a
href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div
class="chapter" title="Chapter�1.�DBUS Interface"><div
class="titlepage"><div><div><h2 class="title"><a
name="dbus-interface"></a>Chapter�1.�DBUS Interface</h2></div></div></div><div
class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a
href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a
href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a
href="#gs-method-Lock">
+ <code class="literal">Lock</code>
++ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-LockMessage">
++ <code class="literal">LockMessage</code>
+ </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
+ <code class="literal">Cycle</code>
+ </a></span></dt><dt><span class="sect2"><a
href="#gs-method-SimulateUserActivity">
+@@ -70,7 +74,11 @@
+ <code class="literal">Lock</code>
+ </h3></div></div></div><p>
+ Request that the screen be locked.
+- </p></div><div class="sect2" title="Cycle"><div
class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
++ </p></div><div class="sect2" title="LockMessage"><div
class="titlepage"><div><div><h3 class="title"><a
name="gs-method-LockMessage"></a>
++ <code class="literal">LockMessage</code>
++ </h3></div></div></div><p>
++ Request that the screen be locked, and set an away message.
++ </p><div class="informaltable"><table
border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the
away message</td></tr></tbody></table></div></div><div class="sect2"
title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a
name="gs-method-Cycle"></a>
+ <code class="literal">Cycle</code>
+ </h3></div></div></div><p>
+ Request that the screen saver theme be restarted and, if applicable,
+--
+1.8.1.6
+
Copied:
cinnamon-screensaver/repos/community-staging-x86_64/lock_screen_on_suspend.patch
(from rev 97700, cinnamon-screensaver/trunk/lock_screen_on_suspend.patch)
===================================================================
--- community-staging-x86_64/lock_screen_on_suspend.patch
(rev 0)
+++ community-staging-x86_64/lock_screen_on_suspend.patch 2013-09-27
17:35:19 UTC (rev 97701)
@@ -0,0 +1,51 @@
+From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinp...@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
+
