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

[Charles Kerr]

Adds a title in the header's action state

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2013-09-04 15:32:43 +0000
+++ src/service.c	2013-09-11 16:54:51 +0000
@@ -332,15 +332,13 @@
 
   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 @@
     }
 
   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);
 }