[cinnamon-settings-daemon] more upower-0.99 fixes

[leigh123linux]

commit 47e281ad624bf3c216e465d71acdbd6d8c3f0f5e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Aug 1 13:47:07 2014 +0200

    more upower-0.99 fixes

 0001-power-upower-0.99-fix.patch |   72 ++++++++++++++++++++++++++++++++++++++
 cinnamon-settings-daemon.spec    |    6 +++-
 2 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/0001-power-upower-0.99-fix.patch b/0001-power-upower-0.99-fix.patch
new file mode 100644
index 0000000..44d8b79
--- /dev/null
+++ b/0001-power-upower-0.99-fix.patch
@@ -0,0 +1,72 @@
+From 2248d3f0e9fc3d2af26e956e8cdde537a8a3946e Mon Sep 17 00:00:00 2001
+From: Fabio Fantoni <fantonifabio at tiscali.it>
+Date: Thu, 31 Jul 2014 11:13:34 +0200
+Subject: [PATCH] power: upower 0.99 fix
+
+Margarita Manterola patch from debian.
+---
+ plugins/power/csd-power-manager.c | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index ecff044..ae8d2ba 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -236,6 +236,10 @@ static void      do_lid_closed_action (CsdPowerManager *manager);
+ static void      lock_screensaver (CsdPowerManager *manager);
+ static void      kill_lid_close_safety_timer (CsdPowerManager *manager);
+ 
++#if UP_CHECK_VERSION(0,99,0)
++static void device_properties_changed_cb (UpDevice *device, GParamSpec *pspec, CsdPowerManager *manager);
++#endif
++
+ G_DEFINE_TYPE (CsdPowerManager, csd_power_manager, G_TYPE_OBJECT)
+ 
+ static gpointer manager_object = NULL;
+@@ -990,6 +994,16 @@ engine_device_add (CsdPowerManager *manager, UpDevice *device)
+                                    "engine-state-old",
+                                    GUINT_TO_POINTER(state));
+         }
++
++#if UP_CHECK_VERSION(0,99,0)
++        g_ptr_array_add (manager->priv->devices_array, g_object_ref(device));
++
++        g_signal_connect (device, "notify::state",
++                          G_CALLBACK (device_properties_changed_cb), manager);
++        g_signal_connect (device, "notify::warning-level",
++                          G_CALLBACK (device_properties_changed_cb), manager);
++#endif
++
+ }
+ 
+ static gboolean
+@@ -1714,7 +1728,11 @@ out:
+ }
+ 
+ static void
++#if UP_CHECK_VERSION(0,99,0)
++device_properties_changed_cb (UpDevice *device, GParamSpec *pspec, CsdPowerManager *manager)
++#else
+ engine_device_changed_cb (UpClient *client, UpDevice *device, CsdPowerManager *manager)
++#endif
+ {
+         UpDeviceKind kind;
+         UpDeviceState state;
+@@ -3986,12 +4004,12 @@ csd_power_manager_start (CsdPowerManager *manager,
+                           G_CALLBACK (engine_device_added_cb), manager);
+         g_signal_connect (manager->priv->up_client, "device-removed",
+                           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 (manager->priv->up_client, "device-changed",
++                          G_CALLBACK (engine_device_changed_cb), manager);
+         g_signal_connect_after (manager->priv->up_client, "changed",
+                                 G_CALLBACK (up_client_changed_cb), manager);
+ #endif
+-- 
+1.9.3
+
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 23cc001..04ffaf2 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        2.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -14,6 +14,7 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daem
 
 Patch0:         0002-Touchpad-support-Added-support-for-two-and-three-fin.patch
 Patch1:         xrandr-manager-upower-0.99-support.patch
+Patch2:         0001-power-upower-0.99-fix.patch
 
 Requires:       cinnamon-control-center-filesystem
 Obsoletes:      cinnamon-settings-daemon-updates
@@ -133,6 +134,9 @@ fi
 
 
 %changelog
+* Fri Aug 01 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.4-3
+- more upower-0.99 fixes
+
 * Mon Jul 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.2.4-2
 - Fix lid action with external monitor (upower-0.99)