[cinnamon-settings-daemon] fix lid suspend action

[leigh123linux]

commit f430cb3b2e15d52ac30312940818978c3c7c099e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Apr 18 20:32:18 2014 +0100

    fix lid suspend action

 cinnamon-settings-daemon.spec |    6 +++++-
 upower_lid.patch              |   28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 361809d..7277a1b 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        2.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -12,6 +12,7 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/cinnamon-settings-daemon/tarball/%%{_internal_version} -O cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.tar.gz
 Patch0:         mpris_pause_fix.patch
+Patch1:         upower_lid.patch
 
 Requires:       cinnamon-control-center-filesystem
 Obsoletes:      cinnamon-settings-daemon-updates
@@ -131,6 +132,9 @@ fi
 
 
 %changelog
+* Fri Apr 18 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.1-3
+- fix lid suspend action
+
 * Fri Apr 18 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.1-2
 - add mpris pause fix
 
diff --git a/upower_lid.patch b/upower_lid.patch
new file mode 100644
index 0000000..a8f44da
--- /dev/null
+++ b/upower_lid.patch
@@ -0,0 +1,28 @@
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -2215,7 +2215,11 @@ do_lid_closed_action (CsdPowerManager *m
+ 
+ 
+ static void
++#if UP_CHECK_VERSION(0,99,0)
++lid_state_changed_cb (UpClient *client, GParamSpec *pspec, CsdPowerManager *manager)
++#else
+ up_client_changed_cb (UpClient *client, CsdPowerManager *manager)
++#endif
+ {
+         gboolean tmp;
+ 
+@@ -3967,8 +3971,13 @@ csd_power_manager_start (CsdPowerManager
+                           G_CALLBACK (engine_device_removed_cb), manager);
+         g_signal_connect (manager->priv->up_client, "device-changed",
+                           G_CALLBACK (engine_device_changed_cb), manager);
++#if UP_CHECK_VERSION(0,99,0)
++        g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed",
++                                G_CALLBACK (lid_state_changed_cb), manager);
++#else
+         g_signal_connect_after (manager->priv->up_client, "changed",
+                                 G_CALLBACK (up_client_changed_cb), manager);
++#endif
+ 
+         /* use the fallback name from gnome-power-manager so the shell
+          * blocks this, and uses the power extension instead */