Merge lp:~robert-ancell/indicator-bluetooth/unity-control-center2 into lp:indicator-bluetooth/14.04

Proposed by Robert Ancell
Status: Merged
Approved by: Ted Gould
Approved revision: 81
Merged at revision: 79
Proposed branch: lp:~robert-ancell/indicator-bluetooth/unity-control-center2
Merge into: lp:indicator-bluetooth/14.04
Diff against target: 28 lines (+5/-2)
2 files modified
debian/control (+1/-1)
src/desktop.vala (+4/-1)
To merge this branch: bzr merge lp:~robert-ancell/indicator-bluetooth/unity-control-center2
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+201118@code.launchpad.net

Commit message

Use unity-control-center if it is available

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
80. By Robert Ancell

Recommend unity-control-center before gnome-control-center

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
81. By Robert Ancell

Only run unity-control-center under unity

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-09-27 02:08:47 +0000
3+++ debian/control 2014-01-21 21:30:00 +0000
4@@ -22,7 +22,7 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 bluez (>= 4.36),
8- gnome-control-center | ubuntu-system-settings,
9+ unity-control-center | gnome-control-center | ubuntu-system-settings,
10 gnome-bluetooth | ubuntu-system-settings,
11 Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2)
12 Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2)
13
14=== modified file 'src/desktop.vala'
15--- src/desktop.vala 2013-12-06 14:25:40 +0000
16+++ src/desktop.vala 2014-01-21 21:30:00 +0000
17@@ -211,7 +211,10 @@
18
19 void show_settings (string panel)
20 {
21- spawn_command_line_async ("gnome-control-center " + panel);
22+ if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
23+ spawn_command_line_async ("unity-control-center " + panel);
24+ else
25+ spawn_command_line_async ("gnome-control-center " + panel);
26 }
27
28 Action create_discoverable_action (Bluetooth bluetooth)

Subscribers

People subscribed via source and target branches