Merge lp:~codygarver/indicator-power/fix-1291051 into lp:indicator-power/14.10

[Charles Kerr]

Add Switchboard as alternative recommend

Add Switchboard as alternative recommend

Sibling to the 14.04 MP at https://code.launchpad.net/~codygarver/indicator-power/fix-1291051/+merge/211170

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/40/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-08-22 14:56:00 +0000
+++ debian/control	2014-10-09 01:24:21 +0000
@@ -30,7 +30,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          upower,
-Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | xfce4-power-manager,
+Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | switchboard-plug-power | xfce4-power-manager,
             indicator-applet (>= 0.2) | indicator-renderer,
 Suggests: powerd,
           unity-system-compositor (>= 0.0.4),

=== modified file 'src/service.c'
--- src/service.c	2014-09-12 00:15:14 +0000
+++ src/service.c	2014-10-09 01:24:21 +0000
@@ -692,6 +692,10 @@
         {
           control_center_cmd = "xfce4-power-manager-settings";
         }
+      else if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Pantheon"))
+        {
+          control_center_cmd = "switchboard --open-plug system-pantheon-power";
+        }
       else
         {
           gchar *path;