summaryrefslogtreecommitdiff
path: root/community/cinnamon-settings-daemon/upower_deprecated.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/cinnamon-settings-daemon/upower_deprecated.patch')
-rw-r--r--community/cinnamon-settings-daemon/upower_deprecated.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/community/cinnamon-settings-daemon/upower_deprecated.patch b/community/cinnamon-settings-daemon/upower_deprecated.patch
deleted file mode 100644
index 3719c849c..000000000
--- a/community/cinnamon-settings-daemon/upower_deprecated.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 44d6bf66141b8cf772d8299106e9fd7fda6a21e3 Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux@googlemail.com>
-Date: Fri, 8 Nov 2013 09:04:44 +0000
-Subject: [PATCH] upower-1.0 changes
-
----
- plugins/power/csd-power-manager.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
-index a8efe08..bae3298 100644
---- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -1157,6 +1157,7 @@ engine_coldplug (CsdPowerManager *manager)
- 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 *manager)
- g_error_free (error);
- goto out;
- }
-+#endif
-
- /* connected mobile phones */
- gpm_phone_coldplug (manager->priv->phone);
-@@ -1306,12 +1308,17 @@ manager_critical_action_get (CsdPowerManager *manager,
-
- 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
-+#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) {
-+#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;
- }
-@@ -2300,6 +2307,7 @@ suspend_with_lid_closed (CsdPowerManager *manager)
- "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 *manager)
- lock_screensaver (manager);
- }
- }
-+#endif
-
- /* ensure we turn the panel back on after resume */
- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3838,10 +3849,12 @@ csd_power_manager_start (CsdPowerManager *manager,
- 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 ();
-+#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",
- 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);
---
-1.9.1
-