Session Menu

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

  1. unity8-system-settings
  2. Merge into trunk.15.10
Proposed by Sebastien Bacher
Status: Merged
Approved by: Charles Kerr
Approved revision: 465
Merged at revision: 466
Proposed branch: lp:~seb128/indicator-session/unity8-system-settings
Merge into: lp:indicator-session/15.10
Diff against target: 70 lines (+13/-4)
3 files modified
CMakeLists.txt (+2/-1)
debian/control (+1/-0)
src/backend-dbus/actions.c (+10/-3)
To merge this branch: bzr merge lp:~seb128/indicator-session/unity8-system-settings
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+269388@code.launchpad.net

Commit message

under unity8 start system-settings instead unity-control-center

Description of the change

under unity8 start system-settings instead unity-control-center

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-01 19:58:12 +0000
3+++ CMakeLists.txt 2015-08-27 15:10:23 +0000
4@@ -29,7 +29,8 @@
5 include (FindPkgConfig)
6 pkg_check_modules (SERVICE REQUIRED
7 glib-2.0>=2.36
8- gio-unix-2.0>=2.36)
9+ gio-unix-2.0>=2.36
10+ url-dispatcher-1>=1)
11 include_directories (${SERVICE_INCLUDE_DIRS})
12
13 set (CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers")
14
15=== modified file 'debian/control'
16--- debian/control 2014-09-23 09:20:13 +0000
17+++ debian/control 2015-08-27 15:10:23 +0000
18@@ -9,6 +9,7 @@
19 intltool,
20 libglib2.0-dev (>= 2.36),
21 libgtest-dev,
22+ liburl-dispatcher1-dev,
23 python,
24 Standards-Version: 3.9.3
25 Homepage: https://launchpad.net/indicator-session
26
27=== modified file 'src/backend-dbus/actions.c'
28--- src/backend-dbus/actions.c 2014-11-30 16:58:56 +0000
29+++ src/backend-dbus/actions.c 2015-08-27 15:10:23 +0000
30@@ -19,6 +19,7 @@
31
32 #include <glib.h>
33 #include <glib/gi18n.h>
34+#include <url-dispatcher.h>
35
36 #include "dbus-end-session-dialog.h"
37 #include "dbus-login1-manager.h"
38@@ -862,7 +863,9 @@
39 static void
40 my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
41 {
42- if (have_unity_control_center ())
43+ if (g_getenv ("MIR_SOCKET") != NULL)
44+ url_dispatch_send("settings:///system", NULL, NULL);
45+ else if (have_unity_control_center ())
46 run_outside_app ("unity-control-center");
47 else
48 run_outside_app ("gnome-control-center");
49@@ -871,7 +874,9 @@
50 static void
51 my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
52 {
53- if (have_unity_control_center ())
54+ if (g_getenv ("MIR_SOCKET") != NULL)
55+ url_dispatch_send("settings:///system/online-accounts", NULL, NULL);
56+ else if (have_unity_control_center ())
57 run_outside_app ("unity-control-center credentials");
58 else
59 run_outside_app ("gnome-control-center credentials");
60@@ -880,7 +885,9 @@
61 static void
62 my_about (IndicatorSessionActions * self G_GNUC_UNUSED)
63 {
64- if (have_unity_control_center ())
65+ if (g_getenv ("MIR_SOCKET") != NULL)
66+ url_dispatch_send("settings:///system/about", NULL, NULL);
67+ else if (have_unity_control_center ())
68 run_outside_app ("unity-control-center info");
69 else
70 run_outside_app ("gnome-control-center info");

Subscribers

People subscribed via source and target branches