Merge lp:~ken-vandine/ubuntu-system-settings/rtm-upower-0.99 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Support UPower 0.99

Support UPower 0.99

[Timo Jyrinki (timo-jyrinki)]

Approving per the bug comment 'I've confirmed the transition to upower 0.99 fixes this issue, really nice improvement all around.' + QA having signed-off the landing.

=== modified file 'debian/control'
--- debian/control	2014-10-31 14:14:22 +0000
+++ debian/control	2014-12-04 14:59:12 +0000
@@ -135,6 +135,7 @@
 Package: ubuntu-system-settings-autopilot
 Architecture: all
 Depends: ubuntu-system-settings,
+         gir1.2-upowerglib-1.0,
          python3-autopilot,
          python3-dbusmock (>= 0.10.1),
          python3-dateutil,
 
=== modified file 'plugins/battery/battery.cpp'
--- plugins/battery/battery.cpp	2014-08-28 07:22:28 +0000
+++ plugins/battery/battery.cpp	2014-12-04 14:59:12 +0000
@@ -63,15 +63,19 @@
 
 void Battery::buildDeviceString() {
     UpClient *client;
-    gboolean returnIsOk;
     GPtrArray *devices;
     UpDeviceKind kind;
 
     client = up_client_new();
+
+#if !UP_CHECK_VERSION(0, 99, 0)
+    gboolean returnIsOk;
+
     returnIsOk = up_client_enumerate_devices_sync(client, nullptr, nullptr);
 
     if(!returnIsOk)
         return;
+#endif
 
     devices = up_client_get_devices(client);
 
 
=== modified file 'plugins/battery/plugin/battery-plugin.cpp'
--- plugins/battery/plugin/battery-plugin.cpp	2014-07-23 13:37:06 +0000
+++ plugins/battery/plugin/battery-plugin.cpp	2014-12-04 14:59:12 +0000
@@ -49,10 +49,13 @@
 {
     BatteryItem *item (static_cast<BatteryItem *> (user_data));
 
+#if !UP_CHECK_VERSION(0, 99, 0)
     gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
     if (!ret) {
         item->setVisibility (false);
-    } else {
+    } else
+#endif
+    {
         GPtrArray *devices = up_client_get_devices (client);
         item->setVisibility (devices->len > 0);
         g_ptr_array_unref (devices);
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-22 21:34:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-12-04 14:59:12 +0000
@@ -22,6 +22,7 @@
 from testtools.matchers import Equals, NotEquals, GreaterThan
 from time import sleep
 from ubuntu_system_settings import SystemSettings
+from gi.repository import UPowerGlib
 
 ACCOUNTS_IFACE = 'org.freedesktop.Accounts'
 ACCOUNTS_USER_IFACE = 'org.freedesktop.Accounts.User'
@@ -43,6 +44,8 @@
 NM_SERVICE = 'org.freedesktop.NetworkManager'
 NM_PATH = '/org/freedesktop/NetworkManager'
 NM_IFACE = 'org.freedesktop.NetworkManager'
+UPOWER_VERSION = str(UPowerGlib.MAJOR_VERSION)
+UPOWER_VERSION += '.' + str(UPowerGlib.MINOR_VERSION)
 
 
 class UbuntuSystemSettingsTestCase(
@@ -74,7 +77,9 @@
         cls.dbus_con = cls.get_dbus(True)
         # Add a mock Upower environment so we get consistent results
         (cls.p_mock, cls.obj_upower) = cls.spawn_server_template(
-            'upower', {'OnBattery': True}, stdout=subprocess.PIPE)
+            'upower',
+            {'OnBattery': True, 'DaemonVersion': UPOWER_VERSION},
+            stdout=subprocess.PIPE)
         cls.dbusmock = dbus.Interface(cls.obj_upower, dbusmock.MOCK_IFACE)
 
     def setUp(self, panel=None):