Merge lp:~ci-train-bot/indicator-keyboard/indicator-keyboard-ubuntu-yakkety-landing-073 into lp:indicator-keyboard

[Michał Sawicz]

=== modified file 'configure.ac'
--- configure.ac	2015-11-25 08:31:33 +0000
+++ configure.ac	2016-08-04 16:21:19 +0000
@@ -46,6 +46,7 @@
 PKG_CHECK_MODULES([FCITX_GCLIENT], [fcitx-gclient])
 PKG_CHECK_MODULES([ACCOUNTSSERVICE], [accountsservice])
 PKG_CHECK_MODULES([LIGHTDM], [liblightdm-gobject-1])
+PKG_CHECK_MODULES([URLDISPATCHER], [url-dispatcher-1 >= 1])
 
 m4_include([m4/gcov.m4])
 AC_TDD_GCOV

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-25 08:45:35 +0000
+++ debian/changelog	2016-08-04 16:21:19 +0000
@@ -1,3 +1,9 @@
+indicator-keyboard (0.0.0+16.10.20160730-0ubuntu1) yakkety; urgency=medium
+
+  * Launch u-s-s under Mir/Unity8
+
+ -- Lukáš Tinkl <[e-mail]>  Sat, 30 Jul 2016 21:19:36 +0000
+
 indicator-keyboard (0.0.0+16.04.20151125-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-11-25 08:45:32 +0000
+++ debian/control	2016-08-04 16:21:19 +0000
@@ -17,6 +17,7 @@
                libgtk-3-dev,
                libibus-1.0-dev (>= 1.5.0),
                liblightdm-gobject-1-dev,
+               liburl-dispatcher1-dev,
                valac,
                xauth,
                xvfb,

=== added file 'deps/url-dispatcher.vapi'
--- deps/url-dispatcher.vapi	1970-01-01 00:00:00 +0000
+++ deps/url-dispatcher.vapi	2016-08-04 16:21:19 +0000
@@ -0,0 +1,9 @@
+[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liburl-dispatcher-1/url-dispatcher.h")]
+
+namespace UrlDispatch
+{
+  public delegate void DispatchCallback ();
+
+  [CCode (cname = "url_dispatch_send")]
+  public static void send (string url, DispatchCallback? func = null);
+}

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2015-11-25 08:31:33 +0000
+++ lib/Makefile.am	2016-08-04 16:21:19 +0000
@@ -1,7 +1,7 @@
 pkglibexec_PROGRAMS = indicator-keyboard-service
 
 AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
-AM_LDFLAGS = -lm
+AM_LDFLAGS = -lm -lurl-dispatcher
 AM_VALAFLAGS = --enable-experimental-non-null   \
                --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
@@ -28,7 +28,8 @@
                                        --pkg ibus-1.0             \
                                        --pkg Fcitx-1.0            \
                                        --pkg AccountsService-1.0  \
-                                       --pkg liblightdm-gobject-1
+                                       --pkg liblightdm-gobject-1 \
+                                       --pkg url-dispatcher
 indicator_keyboard_service_CFLAGS = $(AM_CFLAGS)              \
                                     $(GEE_CFLAGS)             \
                                     $(PANGOCAIRO_CFLAGS)      \
@@ -40,7 +41,8 @@
                                     $(FCITX_GCLIENT_CFLAGS)   \
                                     $(ACCOUNTSSERVICE_CFLAGS) \
                                     $(LIGHTDM_CFLAGS)         \
-                                    $(COVERAGE_CFLAGS)
+                                    $(COVERAGE_CFLAGS)        \
+                                    $(URLDISPATCHER_CFLAGS)
 indicator_keyboard_service_LDFLAGS = $(AM_LDFLAGS)           \
                                      $(GEE_LIBS)             \
                                      $(PANGOCAIRO_LIBS)      \
@@ -52,4 +54,5 @@
                                      $(FCITX_GCLIENT_LIBS)   \
                                      $(ACCOUNTSSERVICE_LIBS) \
                                      $(LIGHTDM_LIBS)         \
-                                     $(COVERAGE_LDFLAGS)
+                                     $(COVERAGE_LDFLAGS)     \
+                                     $(URLDISPATCHER_LDFLAGS)

=== modified file 'lib/main.vala'
--- lib/main.vala	2015-02-19 17:33:44 +0000
+++ lib/main.vala	2016-08-04 16:21:19 +0000
@@ -1145,6 +1145,11 @@
 
 	[DBus (visible = false)]
 	private void handle_activate_settings (Variant? parameter) {
+		if (Environment.get_variable ("MIR_SOCKET") != null) {
+			UrlDispatch.send ("settings:///system/hw-keyboard-layouts");
+			return;
+		}
+
 		try {
 			Process.spawn_command_line_async ("unity-control-center region layouts");
 		} catch (SpawnError error) {