diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-01-22 17:37:58 +0000 |
|---|---|---|
| committer | Tarmac <> | 2014-01-22 17:37:58 +0000 |
| commit | 8d511055888363c557f6efa8c16f8375004c5f11 (patch) | |
| tree | e8552e34bdc033f6ca96c0039e36028868d5f094 | |
| parent | 7f23146bc08362f33d1a2d6aa313f29035066766 (diff) | |
| parent | d36408225a587dd67e8a40719028e264bacad475 (diff) | |
| download | ayatana-indicator-bluetooth-8d511055888363c557f6efa8c16f8375004c5f11.tar.gz ayatana-indicator-bluetooth-8d511055888363c557f6efa8c16f8375004c5f11.tar.bz2 ayatana-indicator-bluetooth-8d511055888363c557f6efa8c16f8375004c5f11.zip | |
Use unity-control-center if it is available. Fixes: https://bugs.launchpad.net/bugs/1257505.
Approved by Ted Gould, PS Jenkins bot.
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/desktop.vala | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 4a9d70e..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 | 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) diff --git a/src/desktop.vala b/src/desktop.vala index 198101a..a6cd433 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.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); } Action create_discoverable_action (Bluetooth bluetooth) |