Merge lp:~robert-ancell/indicator-bluetooth/xdg-current-desktop into lp:indicator-bluetooth

[Robert Ancell]

Correctly use XDG_CURRENT_DESKTOP

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:98
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-bluetooth-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/608
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/614
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/436/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/436
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/436/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-bluetooth-ci/2/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

ubuntu-session has changed the value of XDG_CURRENT_DESKTOP to "Unity:Unity7" so this change is now urgently needed...

[Iain Lane (laney)]

lgtm

review: Approve

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2016-05-12 15:44:25 +0000
+++ src/desktop.vala	2016-06-06 22:19:50 +0000
@@ -211,11 +211,24 @@
   ///  Actions
   ///
 
+  private bool is_desktop (string name)
+  {
+    var desktop_name_list = Environment.get_variable ("XDG_CURRENT_DESKTOP");
+    if (desktop_name_list == null)
+        return false;
+
+    foreach (var n in desktop_name_list.split (":"))
+      if (n == name)
+        return true;
+
+    return false;
+  }
+
   void show_settings (string panel)
   {
     if (Environment.get_variable ("MIR_SOCKET") != null)
       UrlDispatch.send ("settings:///system/bluetooth");
-    else if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
+    else if (is_desktop ("Unity") && Environment.find_program_in_path ("unity-control-center") != null)
       spawn_command_line_async ("unity-control-center " + panel);
     else
       spawn_command_line_async ("gnome-control-center " + panel);