From dce18d4a609242dddd29ac05955ad79ae803d49f Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 10 Jan 2014 12:13:24 +1300
Subject: Use unity-control-center if it is available

---
 debian/control   | 2 +-
 src/desktop.vala | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4a9d70e..8d09e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          bluez (>= 4.36),
-         gnome-control-center | ubuntu-system-settings,
+         gnome-control-center | unity-control-center | ubuntu-system-settings,
          gnome-bluetooth | ubuntu-system-settings,
 Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2)
 Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2)
diff --git a/src/desktop.vala b/src/desktop.vala
index 198101a..26b86f5 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -211,7 +211,10 @@ class Desktop: Profile
 
   void show_settings (string panel)
   {
-    spawn_command_line_async ("gnome-control-center " + panel);
+    if (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);
   }
 
   Action create_discoverable_action (Bluetooth bluetooth)
-- 
cgit v1.2.3


From 722d6102890cdee40976babdcbd3f5f8d6787a3e Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 14 Jan 2014 17:39:09 +1300
Subject: Recommend unity-control-center before gnome-control-center

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8d09e6e..c204f52 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          bluez (>= 4.36),
-         gnome-control-center | unity-control-center | ubuntu-system-settings,
+         unity-control-center | gnome-control-center | ubuntu-system-settings,
          gnome-bluetooth | ubuntu-system-settings,
 Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2)
 Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2)
-- 
cgit v1.2.3


From d36408225a587dd67e8a40719028e264bacad475 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Wed, 22 Jan 2014 10:29:37 +1300
Subject: Only run unity-control-center under unity

---
 src/desktop.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop.vala b/src/desktop.vala
index 26b86f5..a6cd433 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -211,7 +211,7 @@ class Desktop: Profile
 
   void show_settings (string panel)
   {
-    if (Environment.find_program_in_path ("unity-control-center") != null)
+    if (Environment.get_variable ("XDG_CURRENT_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);
-- 
cgit v1.2.3