Fri Mar 1 00:05:33 PST 2013

2 files changed, 95 insertions, 4 deletions

diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index d7932cc34..5b712d8d1 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -5,13 +5,13 @@
 
 pkgname=cinnamon-screensaver
 pkgver=1.7.1
-pkgrel=3
+pkgrel=4
 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=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+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
@@ -19,14 +19,16 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav
        cinnamon2d-screensaver.desktop
        cinnamon-screensaver.pam
        gnome-autogen.sh
-       configure.patch)
+       configure.patch
+       fix-dbus-compatibility.patch)
 
 sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1'
             '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
             '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
             'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb'
             '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc'
-            'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a')
+            'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a'
+            '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1')
 
 build() {
   cd $pkgname-$pkgver
@@ -38,6 +40,9 @@ build() {
 
   patch -uNp2 -r- -i ${srcdir}/configure.patch
 
+  # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
+  patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
                --libexecdir=/usr/lib/cinnamon-screensaver \
                --localstatedir=/var \
diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
new file mode 100644
index 000000000..fa53f6fac
--- /dev/null
+++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
@@ -0,0 +1,86 @@
+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 @@ do_command (GDBusConnection *connection)
+ 
+         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 @@ do_introspect (DBusConnection *connection,
+         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 @@ listener_dbus_handle_session_message (DBusConnection *connection,
+         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 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+                 } 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 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+         } 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 @@ void
+ 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);
+         }