Merge lp:~pitti/powerd/upower0.99 into lp:powerd

[Martin Pitt]

Support upower 0.99.

Port to upower 0.99 (see https://launchpad.net/bugs/1330037)

Thanks to Tim Lunn for the patch!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/powerd-ci/171/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/171/rebuild

review: Needs Fixing (continuous-integration)

[Martin Pitt (pitti)]

FTR, it's impossible to succeed the PS Jenkins test, as that doesn't build against vivid-proposed. But upower 0.99 will be stuck there until we land this transition.

[lp:~pitti/powerd/upower0.99]

148. By Martin Pitt on 2014-10-31

use version check to work for any upower version

[Martin Pitt (pitti)]

As discussed on IRC, I modified this to use conditionals, so that this works with both the old and the new upower. This avoids having to branch off.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/powerd-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/172/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

LGTM

review: Approve

=== modified file 'src/power-source.c'
--- src/power-source.c	2013-09-03 14:10:41 +0000
+++ src/power-source.c	2014-10-31 09:45:19 +0000
@@ -29,7 +29,12 @@
 static double battery_log_level = 4.0f;
 static gboolean stats_logged;
 
-static void up_device_changed_cb(UpClient *client, UpDevice *device,
+static void up_device_changed_cb(UpClient *client,
+#if UP_CHECK_VERSION(0,99,0)
+                                 GParamSpec *pspec,
+#else
+                                 UpDevice *device,
+#endif
                                  gpointer unused)
 {
     gboolean on_battery;
@@ -96,7 +101,6 @@
 int powerd_ps_init(void)
 {
     GValue v = G_VALUE_INIT;
-    gboolean ret;
 
     /*
      * Override default shutdown temperature with device-specific
@@ -119,11 +123,18 @@
         powerd_warn("Could not allocate upower client");
         return -ENODEV;
     }
+
+#if UP_CHECK_VERSION(0,99,0)
+    g_signal_connect(up_client, "notify",
+                     G_CALLBACK(up_device_changed_cb), NULL);
+#else
+    gboolean ret;
     ret = up_client_enumerate_devices_sync(up_client, NULL, NULL);
     if (!ret)
         powerd_warn("Could not enumerate upower devices");
     g_signal_connect(up_client, "device-changed",
                      G_CALLBACK(up_device_changed_cb), NULL);
+#endif
     return 0;
 }