[cinnamon-settings-daemon] simpler version

[Rex Dieter]

commit c101b2910faa8ae680ee6fa11cd3ca47c3479f26
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 7 12:48:23 2013 -0600

    simpler version
    
    use UP_CHECK_VERSION instead of configure switch

 ...n-settings-daemon-2.0.6-upower_deprecated.patch |   80 +++++++++++++-------
 cinnamon-settings-daemon.spec                      |    3 +-
 2 files changed, 56 insertions(+), 27 deletions(-)
---
diff --git a/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch b/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
index e4b2b99..d9def19 100644
--- a/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
+++ b/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
@@ -1,51 +1,79 @@
-diff -up cinnamon-settings-daemon-2.0.6/configure.ac.upower_deprecated cinnamon-settings-daemon-2.0.6/configure.ac
---- cinnamon-settings-daemon-2.0.6/configure.ac.upower_deprecated	2013-11-07 11:06:41.636497971 -0600
-+++ cinnamon-settings-daemon-2.0.6/configure.ac	2013-11-07 11:12:07.937561424 -0600
-@@ -254,6 +254,15 @@ if test x$have_gudev != xno; then
- 	)
- fi
- 
-+AC_ARG_ENABLE([upower-deprecated],
-+              AS_HELP_STRING([--enable-upower-deprecated], [Enable use of deprecated upower-glib apis]),
-+              [with_upower=$enableval],
-+              [with_upower=auto])
-+if test "$with_upower" = "yes" ; then
-+  AC_DEFINE(HAVE_UPOWER_DEPRECATED, 1, [Define if using deprecated upower-glib apis])
-+fi
-+AM_CONDITIONAL(WITH_UPOWER, [test "$with_upower" = "yes"], [Using deprecated upower-glib apis])
-+
- dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
-diff -up cinnamon-settings-daemon-2.0.6/plugins/power/Makefile.am.upower_deprecated cinnamon-settings-daemon-2.0.6/plugins/power/Makefile.am
 diff -up cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c.upower_deprecated cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c
 --- cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c.upower_deprecated	2013-11-03 09:50:04.000000000 -0600
-+++ cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c	2013-11-07 11:06:41.658497571 -0600
-@@ -1306,12 +1306,17 @@ manager_critical_action_get (CsdPowerMan
++++ cinnamon-settings-daemon-2.0.6/plugins/power/csd-power-manager.c	2013-11-07 12:32:57.628725197 -0600
+@@ -1157,6 +1157,7 @@ engine_coldplug (CsdPowerManager *manage
+         gboolean ret;
+         GError *error = NULL;
+ 
++#if ! UP_CHECK_VERSION(0,99,0) 
+         /* get devices from UPower */
+         ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error);
+         if (!ret) {
+@@ -1164,6 +1165,7 @@ engine_coldplug (CsdPowerManager *manage
+                 g_error_free (error);
+                 goto out;
+         }
++#endif
+ 
+         /* connected mobile phones */
+         gpm_phone_coldplug (manager->priv->phone);
+@@ -1306,12 +1308,17 @@ manager_critical_action_get (CsdPowerMan
  
          policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
          if (policy == CSD_POWER_ACTION_SUSPEND) {
 -                if (is_ups == FALSE &&
 -                    up_client_get_can_suspend (manager->priv->up_client))
 +                if (is_ups == FALSE
-+#ifdef HAVE_UPOWER_DEPRECATED
++#if ! UP_CHECK_VERSION(0,99,0)
 +                    && up_client_get_can_suspend (manager->priv->up_client)
 +#endif
 +                )
                          return policy;
                  return CSD_POWER_ACTION_SHUTDOWN;
          } else if (policy == CSD_POWER_ACTION_HIBERNATE) {
-+#ifdef HAVE_UPOWER_DEPRECATED
++#if ! UP_CHECK_VERSION(0,99,0)
                  if (up_client_get_can_hibernate (manager->priv->up_client))
 +#endif
                          return policy;
                  return CSD_POWER_ACTION_SHUTDOWN;
          }
-@@ -3838,10 +3843,12 @@ csd_power_manager_start (CsdPowerManager
+@@ -2300,6 +2307,7 @@ suspend_with_lid_closed (CsdPowerManager
+                                                    "lid-close-ac-action");
+         }
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+         /* check we won't melt when the lid is closed */
+         if (action_type != CSD_POWER_ACTION_SUSPEND &&
+             action_type != CSD_POWER_ACTION_HIBERNATE) {
+@@ -2312,6 +2320,7 @@ suspend_with_lid_closed (CsdPowerManager
+                         lock_screensaver (manager);
+                 }
+         }
++#endif
+ 
+         /* ensure we turn the panel back on after resume */
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+@@ -3539,6 +3548,7 @@ lock_screensaver (CsdPowerManager *manag
+                                       manager);
+ }
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+ static void
+ upower_notify_sleep_cb (UpClient *client,
+                         UpSleepKind sleep_kind,
+@@ -3602,6 +3612,7 @@ upower_notify_resume_cb (UpClient *clien
+                 g_error_free (error);
+         }
+ }
++#endif
+ 
+ static void
+ idle_send_to_sleep (CsdPowerManager *manager)
+@@ -3838,10 +3849,12 @@ csd_power_manager_start (CsdPowerManager
                            G_CALLBACK (engine_settings_key_changed_cb), manager);
          manager->priv->settings_screensaver = g_settings_new ("org.cinnamon.desktop.screensaver");
          manager->priv->up_client = up_client_new ();
-+#ifdef HAVE_UPOWER_DEPRECATED
++#if ! UP_CHECK_VERSION(0,99,0)
          g_signal_connect (manager->priv->up_client, "notify-sleep",
                            G_CALLBACK (upower_notify_sleep_cb), manager);
          g_signal_connect (manager->priv->up_client, "notify-resume",
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 323356f..f87c0e8 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -73,7 +73,8 @@ NOCONFIGURE=1 ./autogen.sh
 %build
 %configure --disable-static \
            --enable-profiling \
-           --enable-systemd --disable-upower-deprecated
+           --enable-systemd
+
 make V=1 %{?_smp_mflags}