Merge lp:~ted/indicator-power/fix-settings3 into lp:indicator-power/13.10

[Ted Gould]

Use URL dispatcher to show settings on the phone

After a discussion with the release team this can be used as long as this merge lands:

https://code.launchpad.net/~ted/url-dispatcher/lib-suggests-service/+merge/185694

DO NOT top approve this until that merge lands. Please, please, please.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

The url-dispatcher change is now merged to trunk. We're in manual publishing mode, so we won't publish a new indicator-power before a new url-dispatcher, therefore approving this to get the build into daily PPA to go with url-dispatcher.

review: Approve

[Ted Gould (ted)]

Thanks for reviewing this Timo!

=== modified file 'configure.ac'
--- configure.ac	2013-09-14 02:43:47 +0000
+++ configure.ac	2013-09-16 01:54:49 +0000
@@ -40,7 +40,8 @@
 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION
                                   gio-2.0 >= $GIO_REQUIRED_VERSION
                                   gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                  gudev-1.0 >= $GUDEV_REQUIRED_VERSION])
+                                  gudev-1.0 >= $GUDEV_REQUIRED_VERSION
+                                  url-dispatcher-1])
 
 ###########################
 # GSETTINGS

=== modified file 'debian/control'
--- debian/control	2013-09-14 02:43:47 +0000
+++ debian/control	2013-09-16 01:54:49 +0000
@@ -9,6 +9,7 @@
                libgtest-dev,
                libglib2.0-dev (>= 2.36),
                libgudev-1.0-dev,
+               liburl-dispatcher1-dev,
                python,
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-power

=== modified file 'src/service.c'
--- src/service.c	2013-09-14 02:43:47 +0000
+++ src/service.c	2013-09-16 01:54:49 +0000
@@ -22,6 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <url-dispatcher.h>
 
 #include "device.h"
 #include "device-provider.h"
@@ -331,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)
     {
@@ -349,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);
 }
@@ -532,7 +526,7 @@
   update_brightness_action_state (self);
   g_object_unref (item);
 
-  g_menu_append (section, _("Battery settings…"), "indicator.activate-settings");
+  g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings");
 
   return G_MENU_MODEL (section);
 }
@@ -685,8 +679,6 @@
                        GVariant      * param  G_GNUC_UNUSED,
                        gpointer        gself  G_GNUC_UNUSED)
 {
-  /* FIXME: unity8 settings */
-
   execute_command ("gnome-control-center power");
 }
 
@@ -698,6 +690,14 @@
   execute_command ("gnome-power-statistics");
 }
 
+static void
+on_phone_settings_activated (GSimpleAction * a      G_GNUC_UNUSED,
+                             GVariant      * param  G_GNUC_UNUSED,
+                             gpointer        gself  G_GNUC_UNUSED)
+{
+  url_dispatch_send("settings://system/battery", NULL, NULL);
+}
+
 /***
 ****
 ***/
@@ -739,6 +739,7 @@
 
   GActionEntry entries[] = {
     { "activate-settings", on_settings_activated },
+    { "activate-phone-settings", on_phone_settings_activated },
     { "activate-statistics", on_statistics_activated }
   };