Merge lp:~charlesk/indicator-power/lp-1224931 into lp:indicator-power/13.10

[Charles Kerr]

Listen for the "Resuming" signal from upower to refresh devices when resuming from suspend/hibernate

Listen for the "Resuming" signal from upower to refresh devices when resuming from suspend/hibernate

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/34/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-power-ci/63/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Makes sense.

review: Approve

=== modified file 'src/device-provider-upower.c'
--- src/device-provider-upower.c	2013-06-19 19:47:23 +0000
+++ src/device-provider-upower.c	2013-10-01 18:57:12 +0000
@@ -249,6 +249,22 @@
 }
 
 static void
+on_upower_resuming (DbusUPower * unused G_GNUC_UNUSED,
+                    gpointer     gself)
+{
+  IndicatorPowerDeviceProviderUPower * self;
+  GHashTableIter iter;
+  gpointer object_path;
+
+  self = INDICATOR_POWER_DEVICE_PROVIDER_UPOWER (gself);
+
+  g_debug ("Resumed from hibernate/sleep; queueing all devices for a refresh");
+  g_hash_table_iter_init (&iter, self->priv->devices);
+  while (g_hash_table_iter_next (&iter, &object_path, NULL))
+    refresh_device_soon (self, object_path);
+}
+
+static void
 on_upower_proxy_ready (GObject        * source G_GNUC_UNUSED,
                        GAsyncResult   * res,
                        gpointer         gself)
@@ -272,6 +288,8 @@
       p = self->priv;
 
       p->upower_proxy = proxy;
+      g_signal_connect (proxy, "resuming",
+                        G_CALLBACK (on_upower_resuming), self);
       g_signal_connect (proxy, "device-changed",
                         G_CALLBACK (on_upower_device_changed), self);
       g_signal_connect (proxy, "device-added",

=== modified file 'src/ib-brightness-control.c'
--- src/ib-brightness-control.c	2013-08-20 03:41:09 +0000
+++ src/ib-brightness-control.c	2013-10-01 18:57:12 +0000
@@ -52,7 +52,7 @@
                 (g_strcmp0 (device_type, "platform") == 0) ||
                 (g_strcmp0 (device_type, "raw") == 0)) {
                 path = g_strdup (g_udev_device_get_sysfs_path (device->data));
-                g_print ("found: %s\n", path);
+                g_debug ("found: %s", path);
                 break;
             }
         }