diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-23 00:28:11 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-23 00:28:11 -0600 |
| commit | f775f62220f99a37158e57b76a098c354b22b690 (patch) | |
| tree | ed03a279a541db320880942c9e259f43c987c2e2 | |
| parent | b33fcf3e703f9c6ed8e0be1aae92263e8697c551 (diff) | |
| parent | c80b2c61c7472651406897e37f40740d85d3a875 (diff) | |
| download | ayatana-indicator-power-f775f62220f99a37158e57b76a098c354b22b690.tar.gz ayatana-indicator-power-f775f62220f99a37158e57b76a098c354b22b690.tar.bz2 ayatana-indicator-power-f775f62220f99a37158e57b76a098c354b22b690.zip | |
Merging with U. Desktop
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/indicator-power.c | 34 |
2 files changed, 25 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 149d222..229f806 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,15 @@ -indicator-power (1.90-0ubuntu1~ppa1) precise; urgency=low +indicator-power (1.90-0ubuntu2) precise; urgency=low + + * src/indicator-power.c + - cherry picked a fix for the icon not changing when state + changes (LP: #933466) + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 17 Feb 2012 10:41:52 -0500 + +indicator-power (1.90-0ubuntu1) precise; urgency=low * New upstream release. - * Support for hiding of icon and settings for it as well + * Support for hiding of icon and settings for it as well (lp: #811769) * Adding a name hint -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:26:48 -0600 diff --git a/src/indicator-power.c b/src/indicator-power.c index 3980988..a5092c1 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -840,26 +840,22 @@ update_visibility (IndicatorPower * self) } 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 @@ service_proxy_cb (GObject *object, /* 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 */ |