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
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
+ && 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_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
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
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",
G_CALLBACK (upower_notify_resume_cb), manager);
+#endif
manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
g_signal_connect (manager->priv->up_client, "device-added",
G_CALLBACK (engine_device_added_cb), manager);