Drop mir-container sessions - they were never used

diff --git a/po/lightdm.pot b/po/lightdm.pot
index d788c91535bd1c8c713ffbaf07781dea9b58bc20..8f0ff3b6e173d9290faeb3ec1350c6490ee69c5e 100644 (file)
--- a/po/lightdm.pot
+++ b/po/lightdm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-20 12:03+1200\n"
+"POT-Creation-Date: 2016-06-22 09:15+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/seat-local.c b/src/seat-local.c
index 833cc6e3f0e1cb0759af6a2a45df264e97ac0027..afd3ee66ce53249f94364170328317462d9f703a 100644 (file)
--- a/src/seat-local.c
+++ b/src/seat-local.c
@@ -187,37 +187,29 @@ get_vt (SeatLocal *seat, DisplayServer *display_server)
 }
 
 static UnitySystemCompositor *
-create_unity_system_compositor (SeatLocal *seat)
+get_unity_system_compositor (SeatLocal *seat)
 {
-    UnitySystemCompositor *compositor;
     const gchar *command;
     gint timeout, vt;
 
-    compositor = unity_system_compositor_new ();
+    if (seat->priv->compositor)
+        return seat->priv->compositor;
+
+    seat->priv->compositor = unity_system_compositor_new ();
 
     command = seat_get_string_property (SEAT (seat), "unity-compositor-command");
     if (command)
-        unity_system_compositor_set_command (compositor, command);
+        unity_system_compositor_set_command (seat->priv->compositor, command);
 
     timeout = seat_get_integer_property (SEAT (seat), "unity-compositor-timeout");
     if (timeout <= 0)
         timeout = 60;
-    unity_system_compositor_set_timeout (compositor, timeout);
+    unity_system_compositor_set_timeout (seat->priv->compositor, timeout);
 
-    vt = get_vt (seat, DISPLAY_SERVER (compositor));
+    vt = get_vt (seat, DISPLAY_SERVER (seat->priv->compositor));
     if (vt >= 0)
-        unity_system_compositor_set_vt (compositor, vt);
-
-    return compositor;
-}
-
-static UnitySystemCompositor *
-get_unity_system_compositor (SeatLocal *seat)
-{
-    if (seat->priv->compositor)
-        return seat->priv->compositor;
+        unity_system_compositor_set_vt (seat->priv->compositor, vt);
 
-    seat->priv->compositor = create_unity_system_compositor (seat);
     seat->priv->next_xmir_id = 0;
     g_signal_connect (seat->priv->compositor, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (compositor_stopped_cb), seat);
 
@@ -329,18 +321,6 @@ seat_local_create_display_server (Seat *s, Session *session)
         return g_object_ref (get_unity_system_compositor (seat));
     else if (strcmp (session_type, "wayland") == 0)
         return create_wayland_session (seat);
-    else if (strcmp (session_type, "mir-container") == 0)
-    {
-        UnitySystemCompositor *compositor;
-        const gchar *compositor_command;
-
-        compositor = create_unity_system_compositor (seat);
-        compositor_command = session_config_get_compositor_command (session_get_config (session));
-        if (compositor_command)
-            unity_system_compositor_set_command (compositor, compositor_command);
-
-        return DISPLAY_SERVER (compositor);
-    }
     else
     {
         l_warning (seat, "Can't create unsupported display server '%s'", session_type);

diff --git a/src/session-config.c b/src/session-config.c
index 34f3a970472aa3970ac4560a6edff9653a916bab..31de204b498a112a445376035683c82a62017234 100644 (file)
--- a/src/session-config.c
+++ b/src/session-config.c
@@ -21,9 +21,6 @@ struct SessionConfigPrivate
 
     /* Command to run */
     gchar *command;
-
-    /* Compositor command to run (for type mir-container) */
-    gchar *compositor_command;
 };
 
 G_DEFINE_TYPE (SessionConfig, session_config, G_TYPE_OBJECT);
@@ -67,7 +64,6 @@ session_config_new_from_file (const gchar *filename, const gchar *default_sessio
             config->priv->desktop_names[1] = NULL;
         }
     }
-    config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL);
 
     g_key_file_free (desktop_file);
 
@@ -95,13 +91,6 @@ session_config_get_desktop_names (SessionConfig *config)
     return config->priv->desktop_names;
 }
 
-const gchar *
-session_config_get_compositor_command (SessionConfig *config)
-{
-    g_return_val_if_fail (config != NULL, NULL);
-    return config->priv->compositor_command;
-}
-
 static void
 session_config_init (SessionConfig *config)
 {
@@ -116,7 +105,6 @@ session_config_finalize (GObject *object)
     g_free (self->priv->session_type);
     g_strfreev (self->priv->desktop_names);
     g_free (self->priv->command);
-    g_free (self->priv->compositor_command);
 
     G_OBJECT_CLASS (session_config_parent_class)->finalize (object);
 }

diff --git a/src/session-config.h b/src/session-config.h
index aea59599722ce016c7fdd101d8dcc4113c4822b2..2de65b322d104b513e6fe1681ced7cd1032ccea4 100644 (file)
--- a/src/session-config.h
+++ b/src/session-config.h
@@ -44,8 +44,6 @@ const gchar *session_config_get_session_type (SessionConfig *config);
 
 gchar **session_config_get_desktop_names (SessionConfig *config);
 
-const gchar *session_config_get_compositor_command (SessionConfig *config);
-
 G_END_DECLS
 
 #endif /* SESSION_CONFIG_H_ */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7d22e1dfd88a9da1566d3dc54832eeb735e976b5..bd4e8ebf84daba8a3b73a0f3608c238e1fb817ad 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -225,7 +225,6 @@ TESTS = \
        test-mir-session \
        test-mir-session-crash \
        test-mir-session-compositor-crash \
-       test-mir-container-session \
        test-xmir-autologin \
        test-xmir-login \
        test-xmir-switch \
@@ -387,7 +386,6 @@ EXTRA_DIST = \
        data/sessions/alternative.desktop \
        data/sessions/default.desktop \
        data/sessions/mir.desktop \
-       data/sessions/mir-container.desktop \
        data/sessions/named.desktop \
        data/sessions/named-legacy.desktop \
        data/sessions/wayland.desktop \
@@ -502,7 +500,6 @@ EXTRA_DIST = \
        scripts/login-wrong-password.conf \
        scripts/login-xserver-crash.conf \
        scripts/mir-autologin.conf \
-       scripts/mir-container-session.conf \
        scripts/mir-greeter.conf \
        scripts/mir-script-hooks.conf \
        scripts/mir-session.conf \

diff --git a/tests/data/sessions/mir-container.desktop b/tests/data/sessions/mir-container.desktop
deleted file mode 100644 (file)
index 72639b3..0000000
--- a/tests/data/sessions/mir-container.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Test Session
-Comment=LightDM test Mir session
-Exec=test-session
-X-LightDM-Session-Type=mir-container
-X-LightDM-System-Compositor-Command=unity-system-compositor --container

diff --git a/tests/scripts/mir-container-session.conf b/tests/scripts/mir-container-session.conf
deleted file mode 100644 (file)
index 02aed84..0000000
--- a/tests/scripts/mir-container-session.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Check can login into a containerised Mir session on a VT based seat
-#
-
-[Seat:*]
-user-session=mir-container
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-
-# X server starts
-#?XSERVER-0 START VT=7 SEAT=seat0
-
-# Daemon connects when X server is ready
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 CONNECT-XSERVER
-#?GREETER-X-0 CONNECT-TO-DAEMON
-#?GREETER-X-0 CONNECTED-TO-DAEMON
-
-# Attempt to log into account
-#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
-#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-0 START-SESSION
-
-# System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=8 XDG_VTNR=8 CONTAINER=TRUE
-#?*UNITY-SYSTEM-COMPOSITOR READY
-
-# Switch to system compositor
-#?VT ACTIVATE VT=8
-
-# Greeter terminates
-#?GREETER-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
-
-# Session starts
-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir-container USER=no-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c1
-
-# Session shown
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
-
-# Cleanup
-#?*STOP-DAEMON
-#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
-#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0

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