Prevent PID error when launching guest session in LXDE

diff --git a/data/apparmor/lightdm-guest-session.in b/data/apparmor/lightdm-guest-session.in
index dbd6e06f0d24b615b2c5240d0ca39cd68c79028f..ae27385b84f25afb10dc3aedc2b1b86d44c653a8 100644 (file)
--- a/data/apparmor/lightdm-guest-session.in
+++ b/data/apparmor/lightdm-guest-session.in
@@ -9,6 +9,12 @@
 
   # chromium-browser needs special confinement due to its sandboxing
   #include <abstractions/lightdm_chromium-browser>
+
+  # fcitx and friends needs special treatment due to C/S design
+  #include <abstractions/fcitx>
+
+  # mozc_server needs special treatment due to C/S design
+  #include <abstractions/mozc_server>
 }
 
 /etc/xdg/lxsession/Lubuntu/* cx,  # LP1273524

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 409c0a46e8894e33bbf2b2419afc723d90a52782..597512a7762380e4436e33f0c7cfc2c3a865f9c8 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -203,9 +203,6 @@ create_x_server (Seat *seat)
     x_server = x_server_local_new ();
 
     command = seat_get_string_property (seat, "xmir-command");
-    /* Fall back to using X if Xmir is not available as this was the previous way XMir worked */
-    if (strcmp (command, "Xmir") == 0 && !g_find_program_in_path ("Xmir"))
-        command = seat_get_string_property (seat, "xserver-command");
     x_server_local_set_command (x_server, command);
 
     id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9f9556a8fd10341cf00a4d7317be08e9a8a34c6..7ac2eb61cd10d7687c4248434558a3e26ff24097 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -236,7 +236,6 @@ TESTS = \
        test-unity-compositor-next-session \
        test-unity-compositor-mir-next-session \
        test-unity-autologin \
-       test-unity-autologin-legacy \
        test-unity-login \
        test-unity-switch \
        test-unity-plymouth \
@@ -563,7 +562,6 @@ EXTRA_DIST = \
        scripts/switch-to-user-resettable.conf \
        scripts/system-xauthority.conf \
        scripts/unity-autologin.conf \
-       scripts/unity-autologin-legacy.conf \
        scripts/unity-compositor-command.conf \
        scripts/unity-compositor-crash.conf \
        scripts/unity-compositor-fail-ready.conf \

diff --git a/tests/scripts/unity-autologin-legacy.conf b/tests/scripts/unity-autologin-legacy.conf
deleted file mode 100644 (file)
index c1a13e1..0000000
--- a/tests/scripts/unity-autologin-legacy.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Check use legacy X command if Xmir not present
-#
-
-[test-xmir]
-hide=true
-
-[Seat:*]
-type=unity
-autologin-user=have-password1
-user-session=default
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-
-# System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7
-#?*UNITY-SYSTEM-COMPOSITOR READY
-
-# X server starts
-#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0
-
-# Daemon connects when X server is ready
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Session starts
-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-#?XSERVER-0 ACCEPT-CONNECT
-#?SESSION-X-0 CONNECT-XSERVER
-
-# System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
-
-# Cleanup
-#?*STOP-DAEMON
-#?SESSION-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
-#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index 734f52b2049f43d3c33ce66397328f3b97a148ae..c282b3ec08c4b42a7763da1e1a3cc694aeb144cf 100644 (file)
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -184,14 +184,6 @@ setresuid (uid_t ruid, uid_t uuid, uid_t suid)
 static gchar *
 redirect_path (const gchar *path)
 {
-    /* Hide Xmir for legacy tests */
-    if (g_str_has_suffix (path, "/Xmir"))
-    {
-        connect_status ();
-        if (g_key_file_get_boolean (config, "test-xmir", "hide", NULL))
-            return NULL;
-    }
-
     // Don't redirect if inside the running directory
     if (g_str_has_prefix (path, g_getenv ("LIGHTDM_TEST_ROOT")))
         return g_strdup (path);

diff --git a/tests/test-unity-autologin-legacy b/tests/test-unity-autologin-legacy
deleted file mode 100755 (executable)
index 1282544..0000000
--- a/tests/test-unity-autologin-legacy
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner unity-autologin-legacy test-gobject-greeter