Merge lp:~ochosi/indicator-power/xfce4-powermanager-settings into lp:indicator-power/14.04

[Simon Steinbeiß]

This tiny patch (along the lines of indicator-sound: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.14.04/view/head:/src/service.vala#L120) adds support for opening xfce4-powermanager-settings if indicator-power is in a Xubuntu session. It will also make it easier to add other desktops, e.g. if ubuntu-studio decide they want to use it as well.

This would be very useful, as we (Xubuntu team) plan to use indicator-power by default in 14.04.

(Rebased version of the patch on top of Robert's u-c-c branch that just got merged.)

[Sebastien Bacher (seb128)]

Thanks for the work there, that seems slightly buggy though, in the case where the session is not Unity you do

" gchar *path
...
 g_free (path);"

that's likely to lead to invalid frees since you don't init path to NULL

review: Needs Fixing

[Lars Karlitski (larsu)]

Thanks for the patch. I've fixed the free() and rearranged the logic a bit to have a proper fallback on non-unity sessions at lp:~larsu/indicator-power/xfce-control-center

=== modified file 'src/service.c'
--- src/service.c	2014-01-10 02:02:31 +0000
+++ src/service.c	2014-01-21 17:44:49 +0000
@@ -693,12 +693,16 @@
                        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");
+  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
+  {
+    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");
+  }
+  else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+    execute_command ("xfce4-power-manager-settings");
   g_free (path);
 }