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

[Robert Ancell]

Use unity-control-center if it is available

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/84/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/indicator-sound/unity-control-center2]

408. By Robert Ancell on 2014-01-14

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:408
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/85/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/indicator-sound/unity-control-center2]

409. By Robert Ancell on 2014-01-21

Only run unity-control-center under unity

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/87/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-11-18 14:40:22 +0000
+++ debian/control	2014-01-21 21:33:01 +0000
@@ -31,7 +31,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          pulseaudio,
-Recommends: gnome-control-center | ubuntu-system-settings,
+Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings,
 Description: System sound indicator.
  System sound indicator which provides easy control of the PulseAudio sound 
  daemon.

=== modified file 'src/service.vala'
--- src/service.vala	2014-01-15 15:32:51 +0000
+++ src/service.vala	2014-01-21 21:33:01 +0000
@@ -124,7 +124,12 @@
 		if (env == "xubuntu" || env == "ubuntustudio")
 			cmd = "pavucontrol";
 		else
-			cmd = "gnome-control-center sound";
+		{
+			if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
+				cmd = "unity-control-center sound";
+			else
+				cmd = "gnome-control-center sound";
+		}
 
 		try {
 			Process.spawn_command_line_async (cmd);