Merge lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager

[Robert Ancell]

Open control center links in unity-control-center if appropriate

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/activity-log-manager-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/activity-log-manager-ci/10/rebuild

review: Approve (continuous-integration)

=== modified file 'src/security-widget.vala'
--- src/security-widget.vala	2014-02-06 16:12:21 +0000
+++ src/security-widget.vala	2014-04-15 02:03:59 +0000
@@ -111,7 +111,12 @@
 			var link_password = new Gtk.LinkButton (_("Password Settings"));
 			link_password.activate_link.connect (() => {
 				try {
-					Process.spawn_command_line_async ("gnome-control-center user-accounts");
+					var have_ucc = Environment.find_program_in_path ("unity-control-center") != null;
+					var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null;
+					if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity"))
+						Process.spawn_command_line_async ("unity-control-center user-accounts");
+					else
+						Process.spawn_command_line_async ("gnome-control-center user-accounts");
 				} catch (SpawnError e) {
 					warning ("%s", e.message);
 				}
@@ -124,7 +129,12 @@
 			var link_power = new Gtk.LinkButton(_("Power Settings"));
 			link_power.activate_link.connect (() => {
 				try {
-					Process.spawn_command_line_async ("gnome-control-center power");
+					var have_ucc = Environment.find_program_in_path ("unity-control-center") != null;
+					var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null;
+					if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity"))
+						Process.spawn_command_line_async ("unity-control-center power");
+					else
+						Process.spawn_command_line_async ("gnome-control-center power");
 				} catch (SpawnError e) {
 					warning ("%s", e.message);
 				}