Merge lp:~larsu/indicator-power/xfce-control-center into lp:indicator-power/14.04

[Lars Karlitski]

Run xfce-powermanager-settings when in an Xubuntu session

[Sebastien Bacher (seb128)]

Looks good to me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/service.c'
--- src/service.c	2014-01-10 02:02:31 +0000
+++ src/service.c	2014-01-22 10:56:02 +0000
@@ -692,14 +692,29 @@
                        GVariant      * param  G_GNUC_UNUSED,
                        gpointer        gself  G_GNUC_UNUSED)
 {
-  gchar *path;
-
-  path = g_find_program_in_path ("unity-control-center");
-  if (path != NULL)
-    execute_command ("unity-control-center power");
-  else
-    execute_command ("gnome-control-center power");
-  g_free (path);
+  static const gchar *control_center_cmd = NULL;
+
+  if (control_center_cmd == NULL)
+    {
+      if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+        {
+          control_center_cmd = "xfce4-power-manager-settings";
+        }
+      else
+        {
+          gchar *path;
+
+          path = g_find_program_in_path ("unity-control-center");
+          if (path != NULL)
+            control_center_cmd = "unity-control-center power";
+          else
+            control_center_cmd = "gnome-control-center power";
+
+          g_free (path);
+        }
+    }
+
+  execute_command (control_center_cmd);
 }
 
 static void