Merge lp:~calumlind/indicator-power/open_in_batt_stats_tab into lp:indicator-power/14.04

[Matthew Paul Thomas]

From bug 1255655: "focus[es] the correct tab upon opening gnome-power-statistics when clicking the indicator battery."

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/74/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/11/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:219
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/75/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/12/console

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

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Hey, thanks for the patch.

Can you please use

  g_menu_item_set_action_and_target (item, "indicator.activate-statistics", "s",
                                     indicator_power_device_get_object_path (device));

It reads a bit nicer without the string allocation.

The issue Jenkins reports happens because lcov 1.10 isn't in the list of supported versions in gcov.m4. I've put up a merge request for that[1]. Let's just wait until that landed before merging this commit.

[1] https://code.launchpad.net/~larsu/indicator-power/allow-lcov-1.10/+merge/197525

[lp:~calumlind/indicator-power/open_in_batt_stats_tab]

219. By Cas on 2013-12-04

Focus to battery tab when opening in gnome-power-statistics

220. By Cas on 2013-12-04

merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:220
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Since lars had requests I'll leave it for him to top-approve, but this looks fine and is working for me.

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2013-11-29 15:37:22 +0000
+++ src/service.c	2013-12-04 12:44:51 +0000
@@ -378,6 +378,8 @@
     label = indicator_power_device_get_label (device);
     item = g_menu_item_new (label, "indicator.activate-statistics");
     g_free (label);
+    g_menu_item_set_action_and_target(item, "indicator.activate-statistics", "s",
+                                      indicator_power_device_get_object_path (device));
 
     if ((icon = indicator_power_device_get_gicon (device)))
       {
@@ -695,10 +697,13 @@
 
 static void
 on_statistics_activated (GSimpleAction * a      G_GNUC_UNUSED,
-                         GVariant      * param  G_GNUC_UNUSED,
+                         GVariant      * param,
                          gpointer        gself  G_GNUC_UNUSED)
 {
-  execute_command ("gnome-power-statistics");
+  char *cmd = g_strconcat ("gnome-power-statistics", " --device ",
+                           g_variant_get_string (param, NULL), NULL);
+  execute_command (cmd);
+  g_free (cmd);
 }
 
 static void
@@ -724,7 +729,7 @@
   GActionEntry entries[] = {
     { "activate-settings", on_settings_activated },
     { "activate-phone-settings", on_phone_settings_activated },
-    { "activate-statistics", on_statistics_activated }
+    { "activate-statistics", on_statistics_activated, "s" }
   };
 
   p->actions = g_simple_action_group_new ();