[cinnamon-settings-daemon] Fix lid action with external monitor (upower-0.99)

[leigh123linux]

commit dd568c7527c8ac2bd5e96edc20f5159cd1588a33
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Jul 14 10:17:52 2014 +0100

    Fix lid action with external monitor (upower-0.99)

 cinnamon-settings-daemon.spec            |    6 +++++-
 xrandr-manager-upower-0.99-support.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index ffc14d4..23cc001 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        2.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -13,6 +13,7 @@ URL:            http://cinnamon.linuxmint.com
 Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.tar.gz
 
 Patch0:         0002-Touchpad-support-Added-support-for-two-and-three-fin.patch
+Patch1:         xrandr-manager-upower-0.99-support.patch
 
 Requires:       cinnamon-control-center-filesystem
 Obsoletes:      cinnamon-settings-daemon-updates
@@ -132,6 +133,9 @@ fi
 
 
 %changelog
+* Mon Jul 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.4-2
+- Fix lid action with external monitor (upower-0.99)
+
 * Fri Jun 27 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.4-1
 - update to 2.2.4
 - Touchpad support: Added support for two and three finger clicks
diff --git a/xrandr-manager-upower-0.99-support.patch b/xrandr-manager-upower-0.99-support.patch
new file mode 100644
index 0000000..328ca9f
--- /dev/null
+++ b/xrandr-manager-upower-0.99-support.patch
@@ -0,0 +1,28 @@
+--- a/plugins/xrandr/csd-xrandr-manager.c
++++ b/plugins/xrandr/csd-xrandr-manager.c
+@@ -1979,7 +1979,11 @@
+ }
+ 
+ static void
++#if UP_CHECK_VERSION(0,99,0)
++lid_state_changed_cb (UpClient *client, GParamSpec *pspec, gpointer data)
++#else
+ power_client_changed_cb (UpClient *client, gpointer data)
++#endif
+ {
+         CsdXrandrManager *manager = data;
+         CsdXrandrManagerPrivate *priv = manager->priv;
+@@ -2029,8 +2033,13 @@
+ 
+         manager->priv->upower_client = up_client_new ();
+         manager->priv->laptop_lid_is_closed = up_client_get_lid_is_closed (manager->priv->upower_client);
++#if UP_CHECK_VERSION(0,99,0)
++        g_signal_connect (manager->priv->upower_client, "notify::lid-is-closed",
++                          G_CALLBACK (lid_state_changed_cb), manager);
++#else
+         g_signal_connect (manager->priv->upower_client, "changed",
+                           G_CALLBACK (power_client_changed_cb), manager);
++#endif
+ 
+         log_msg ("State of screen at startup:\n");
+         log_screen (manager->priv->rw_screen);