[Pkg-xfce-commits] r8508 - in /desktop/trunk/xfce4-power-manager/debian: changelog patches/05_upower-0.99.patch patches/series
Jackson Doak
noskcaj-guest at moszumanska.debian.org
Wed Jul 16 08:31:33 UTC 2014
Author: noskcaj-guest
Date: Wed Jul 16 08:31:32 2014
New Revision: 8508
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8508
Log:
Add patch to support upower 0.99. Closes: #752428
Added:
desktop/trunk/xfce4-power-manager/debian/patches/05_upower-0.99.patch
Modified:
desktop/trunk/xfce4-power-manager/debian/changelog
desktop/trunk/xfce4-power-manager/debian/patches/series
Modified: desktop/trunk/xfce4-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-power-manager/debian/changelog?rev=8508&op=diff
==============================================================================
--- desktop/trunk/xfce4-power-manager/debian/changelog (original)
+++ desktop/trunk/xfce4-power-manager/debian/changelog Wed Jul 16 08:31:32 2014
@@ -1,3 +1,9 @@
+xfce4-power-manager (1.2.0-5) UNRELEASED; urgency=medium
+
+ * Add patch to support upower 0.99. Closes: #752428
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Wed, 16 Jul 2014 18:30:06 +1000
+
xfce4-power-manager (1.2.0-4) unstable; urgency=medium
* debian/control:
Added: desktop/trunk/xfce4-power-manager/debian/patches/05_upower-0.99.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-power-manager/debian/patches/05_upower-0.99.patch?rev=8508&op=file
==============================================================================
--- desktop/trunk/xfce4-power-manager/debian/patches/05_upower-0.99.patch (added)
+++ desktop/trunk/xfce4-power-manager/debian/patches/05_upower-0.99.patch Wed Jul 16 08:31:32 2014
@@ -0,0 +1,143 @@
+---
+ src/xfpm-power-common.h | 8 ++++++
+ src/xfpm-power.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 64 insertions(+), 1 deletion(-)
+
+--- a/src/xfpm-power-common.h
++++ b/src/xfpm-power-common.h
+@@ -33,9 +33,17 @@
+ #define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups"
+ #define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups"
+
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ #define POLKIT_AUTH_SUSPEND "org.freedesktop.upower.suspend"
+ #define POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate"
++#else
++#define LOGIND_NAME "org.freedesktop.login1"
++#define LOGIND_PATH "/org/freedesktop/login1"
++#define LOGIND_IFACE "org.freedesktop.login1.Manager"
+
++#define POLKIT_AUTH_SUSPEND "org.freedesktop.login1.suspend"
++#define POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate"
++#endif
+
+ GPtrArray *xfpm_power_enumerate_devices (DBusGProxy *proxy);
+
+--- a/src/xfpm-power.c
++++ b/src/xfpm-power.c
+@@ -72,7 +72,10 @@ struct XfpmPowerPrivate
+
+ DBusGProxy *proxy;
+ DBusGProxy *proxy_prop;
+-
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++ DBusGProxy *proxy_logind;
++#endif
++
+ GHashTable *hash;
+
+ XfpmConsoleKit *console;
+@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower
+ }
+ #endif
+
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ static void
+ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
+ {
+@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, G
+ power->priv->can_hibernate = ret;
+ }
+ }
++#else
++static gboolean
++xfpm_power_can_sleep_method (XfpmPower *power, const char *method)
++{
++ GError *error = NULL;
++ char *retstr = NULL;
++ gboolean ret = FALSE;
++
++ if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error,
++ G_TYPE_INVALID,
++ G_TYPE_STRING, &retstr,
++ G_TYPE_INVALID))
++ {
++ g_warning ("Unable to check %s method: %s", method, error->message);
++ g_error_free (error);
++
++ return FALSE;
++ }
++
++ if (retstr && !strcmp (retstr, "yes"))
++ ret = TRUE;
++ g_free (retstr);
++
++ return ret;
++}
++#endif
+
+ static void
+ xfpm_power_check_power (XfpmPower *power, GHashTable *props)
+@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *po
+
+ props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE);
+
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ xfpm_power_check_pm (power, props);
++#else
++ power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend");
++ power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate");
++#endif
+ xfpm_power_check_lid (power, props);
+ xfpm_power_check_power (power, props);
+
+@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, cons
+ xfpm_lock_screen ();
+ }
+
++#ifdef WITH_SLEEP_MANAGER_UPOWER
+ dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
++#else
++ dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error,
++ G_TYPE_BOOLEAN, TRUE,
++ G_TYPE_INVALID,
++ G_TYPE_INVALID);
++#endif
+
+ if ( error )
+ {
+@@ -1361,12 +1403,20 @@ xfpm_power_init (XfpmPower *power)
+ UPOWER_NAME,
+ UPOWER_PATH,
+ DBUS_INTERFACE_PROPERTIES);
++
+ if (power->priv->proxy_prop == NULL)
+ {
+ g_critical ("Unable to create proxy for %s", UPOWER_NAME);
+ goto out;
+ }
+
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++ power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus,
++ LOGIND_NAME,
++ LOGIND_PATH,
++ LOGIND_IFACE);
++#endif
++
+ xfpm_power_get_power_devices (power);
+ xfpm_power_get_properties (power);
+ #ifdef ENABLE_POLKIT
+@@ -1468,6 +1518,11 @@ xfpm_power_finalize (GObject *object)
+ if ( power->priv->proxy_prop )
+ g_object_unref (power->priv->proxy_prop);
+
++#ifndef WITH_SLEEP_MANAGER_UPOWER
++ if ( power->priv->proxy_logind )
++ g_object_unref (power->priv->proxy_logind);
++#endif
++
+ g_hash_table_destroy (power->priv->hash);
+
+ #ifdef ENABLE_POLKIT
Modified: desktop/trunk/xfce4-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-power-manager/debian/patches/series?rev=8508&op=diff
==============================================================================
--- desktop/trunk/xfce4-power-manager/debian/patches/series (original)
+++ desktop/trunk/xfce4-power-manager/debian/patches/series Wed Jul 16 08:31:32 2014
@@ -2,3 +2,4 @@
02_translations-fix-invalid-format-strings.patch
03_fix-insert-battery.patch
04_fix-missing-icons-for-non-system-batteries.patch
+05_upower-0.99.patch
More information about the Pkg-xfce-commits
mailing list