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

[Cody Garver]

Add Switchboard as alternative recommend

[Charles Kerr (charlesk)]

lgtm. Thanks Cody!

review: Approve

[Sebastien Bacher (seb128)]

the code change looks fine, you might want add "pantheon" as an alternative recommends as well though, to avoid pulling it another of the settings ui if yours is installed

[Cody Garver (codygarver)]

I have added switchboard-plug-power (the package that provides system-pantheon-power) as an alternative recommendation in the packaging

[Sebastien Bacher (seb128)]

> I have added switchboard-plug-power (the package that provides system-pantheon-power) as an alternative recommendation in the packaging

Thanks, but you added to the wrong line, it should be an alternative to the other control/settings binaries, not to the renderer

review: Needs Fixing

[Sebastien Bacher (seb128)]

changing to "work in progress", change it back to "needs review" once the needsfixing is resolved

[Cody Garver (codygarver)]

I have corrected the packaging.

Please have a look at these related reviews as well:

* https://code.launchpad.net/~elementary-os/indicator-sound/onlyshowin-add-pantheon/+merge/214235

* https://code.launchpad.net/~elementary-os/indicator-session/onlyshowin-add-pantheon/+merge/214224

* https://code.launchpad.net/~elementary-os/indicator-application/onlyshowin-add-pantheon/+merge/214228

* https://code.launchpad.net/~elementary-os/indicator-datetime/onlyshowin-add-pantheon/+merge/214232

[Lars Karlitski (larsu)]

We just specified $XDG_CURRENT_DESKTOP at the freedesktop summit. It's set by all desktops that I'm aware of.

Do you mind using that environment variable or is there a reason for using $DESKTOP_SESSION instead?

[Cody Garver (codygarver)]

Let me talk it over with team members

[Cody Garver (codygarver)]

Now using XDG_CURRENT_DESKTOP. Does "pantheon" need to become "Pantheon" or is it fine as it is?

[Sergey "Shnatsel" Davidoff (shnatsel)]

It has to become "Pantheon".

Alternatively, you can perform a case-insensitive comparison using one of these functions:
https://developer.gnome.org/glib/2.40/glib-Unicode-Manipulation.html#g-utf8-casefold
https://developer.gnome.org/glib/2.40/glib-String-Utility-Functions.html#g-ascii-strncasecmp

[lp:~codygarver/indicator-power/fix-1291051]

239. By Cody Garver on 2014-04-09

Uppercase Pantheon

[Cody Garver (codygarver)]

Fixed, thanks Sergey

[Sebastien Bacher (seb128)]

looks fine now

review: Approve

Unmerged revisions

239. By Cody Garver on 2014-04-09

Uppercase Pantheon

238. By Cody Garver on 2014-04-09

Use XDG_CURRENT_DESKTOP instead

237. By Cody Garver on 2014-04-09

Correct packaging

236. By Cody Garver on 2014-03-24

Add switchboard-plug-power as an alternative recommendation in packaging

235. By Cody Garver on 2014-03-15

Add support for Switchboard when in Pantheon session to fix bug #1291051

=== modified file 'debian/control'
--- debian/control	2014-02-18 19:20:57 +0000
+++ debian/control	2014-04-09 09:28:54 +0000
@@ -24,7 +24,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,
 Description: Indicator showing power state.
  This indicator displays current power management information and gives 

=== modified file 'src/service.c'
--- src/service.c	2014-03-28 16:10:35 +0000
+++ src/service.c	2014-04-09 09:28:54 +0000
@@ -747,6 +747,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;