diff options
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/desktop.vala | 5 |
3 files changed, 29 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 946f747..8b6ab3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +indicator-bluetooth (0.0.6+14.04.20140124-0ubuntu1) trusty; urgency=low + + [ Charles Kerr ] + * Gets us a little closer to the spec in two ways: 1. Indicator + Visibility On the desktop, the indicator's header icon is visible + whenever a default adapter is available (whether the adapter is + powered or not) and the user's preference settings call for a + visible Bluetooth indicator. On the phone, the indicator's header + icon is visible whenever a default adapter is available *and* the + adapter is powered. 2. Header Icon If Bluetooth is off, the header + icon now uses the "bluetooth-disabled" icon. If Bluetooth is on, it + now uses the "bluetooth-active" icon. If Bluetooth is on and has a + connected device, it now uses the "bluetooth-paired" icon. (LP: + #1126108) + * Switching DBus service to an Upstart Job. + + [ Robert Ancell ] + * Use unity-control-center if it is available. (LP: #1257505) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 79 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 24 Jan 2014 10:59:56 +0000 + indicator-bluetooth (0.0.6+14.04.20131029.1-0ubuntu1) trusty; urgency=low [ Dmitrijs Ledkovs ] 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) |