Merge lp:~charlesk/indicator-power/fix-933466 into lp:indicator-power/1.0

[Charles Kerr]

[Charles Kerr (charlesk)]

comments #9 and #10 in the ticket give a little background on this change.

[Omer Akram (om26er)]

fix works for me ;-)

review: Approve (functional)

[Ted Gould (ted)]

Looks good to me!

  review approve
  status approved

review: Approve

[Charles Kerr (charlesk)]

Ted, you're working late. :)

So this is my first Ubuntu FF. This isn't a feature ticket (obviously), but before I merge, I thought I'd ask -- do changes still just go into trunk at this stage, or are there other steps involved?

=== modified file 'src/indicator-power.c'
--- src/indicator-power.c	2012-02-14 13:06:16 +0000
+++ src/indicator-power.c	2012-02-16 21:53:20 +0000
@@ -840,26 +840,22 @@
 }
 
 static void
-receive_signal (GDBusProxy *proxy,
-                gchar      *sender_name,
-                gchar      *signal_name,
-                GVariant   *parameters,
-                gpointer    user_data)
+receive_properties_changed (GDBusProxy *proxy                  G_GNUC_UNUSED,
+                            GVariant   *changed_properties     G_GNUC_UNUSED,
+                            GStrv       invalidated_properties G_GNUC_UNUSED,
+                            gpointer    user_data)
 {
   IndicatorPower *self = INDICATOR_POWER (user_data);
 
-  if (g_strcmp0 (signal_name, "Changed") == 0)
-    {
-      /* get the new state */
-      g_dbus_proxy_call (self->proxy,
-                         "GetDevices",
-                         NULL,
-                         G_DBUS_CALL_FLAGS_NONE,
-                         -1,
-                         self->proxy_cancel,
-                         get_devices_cb,
-                         user_data);
-    }
+  /* it's time to refresh our device list */
+  g_dbus_proxy_call (self->proxy,
+                     "GetDevices",
+                     NULL,
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1,
+                     self->proxy_cancel,
+                     get_devices_cb,
+                     user_data);
 }
 
 static void
@@ -884,8 +880,8 @@
 
   /* we want to change the primary device changes */
   g_signal_connect (self->proxy,
-                    "g-signal",
-                    G_CALLBACK (receive_signal),
+                    "g-properties-changed",
+                    G_CALLBACK (receive_properties_changed),
                     user_data);
 
   /* get the initial state */