Merge lp:~seb128/indicator-datetime/unity8-system-settings into lp:indicator-datetime/15.10

[Sebastien Bacher]

under unity8 start system-settings instead unity-control-center,
don't special case u-c-c by looking for the binary, Unity installations
come with it installed

under unity8 start system-settings instead unity-control-center,
don't special case u-c-c by looking for the binary, Unity installations
come with it installed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Don't love dropping the path, but I think that it makes sense.

review: Approve

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/actions-live.cpp'
--- src/actions-live.cpp	2015-03-31 23:54:04 +0000
+++ src/actions-live.cpp	2015-08-27 14:10:38 +0000
@@ -61,18 +61,18 @@
 
 void LiveActions::desktop_open_settings_app()
 {
-    auto path = g_find_program_in_path("unity-control-center");
-
-    if ((path != nullptr) && (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
-    {
-        execute_command("unity-control-center datetime");       
+    if (g_getenv ("MIR_SOCKET") != nullptr)
+    {
+        dispatch_url("settings:///system/time-date");
+    }
+    else if ((g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
+    {
+        execute_command("unity-control-center datetime");
     }
     else
     {
         execute_command("gnome-control-center datetime");
     }
-
-    g_free (path);
 }
 
 bool LiveActions::desktop_has_calendar_app() const