diff options
-rw-r--r-- | debian/changelog | 32 | ||||
-rw-r--r-- | src/service.c | 15 |
2 files changed, 36 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 30f05ff..05a590c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Adds a title in the header's action state. (LP: #1223635) + + [ Ted Gould ] + * Use URL Dispatcher for settings on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 196 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 13 Sep 2013 15:15:31 +0000 + +indicator-power (12.10.6+13.10.20130830.2-0ubuntu1) saucy; urgency=low + + [ Sebastien Bacher ] + * don't depends on gnome-control-center, recommends is enough, since + it's only required for the preferences menu item. Let ubuntu-system- + settings replace it as an alternative, that's needed on the touch + image. + * revert previous commit, liburl-dispatcher1 depends on upstart-app- + launch which is in universe, that's blocking indicators from + landing. + + [ Ted Gould ] + * Make settings work on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 193 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 30 Aug 2013 10:07:38 +0000 + indicator-power (12.10.6+13.10.20130823-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/src/service.c b/src/service.c index b4f05ea..b5227f6 100644 --- a/src/service.c +++ b/src/service.c @@ -332,15 +332,13 @@ create_header_state (IndicatorPowerService * self) g_variant_builder_init (&b, G_VARIANT_TYPE("a{sv}")); + g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (_("Battery"))); + g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (should_be_visible (self))); if (label != NULL) - { - g_variant_builder_add (&b, "{sv}", "label", g_variant_new_string (label)); - - g_free (label); - } + g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); if (icon != NULL) { @@ -350,12 +348,7 @@ create_header_state (IndicatorPowerService * self) } if (a11y != NULL) - { - g_variant_builder_add (&b, "{sv}", "accessible-desc", - g_variant_new_string (a11y)); - - g_free (a11y); - } + g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_take_string (a11y)); return g_variant_builder_end (&b); } |