Rename xlocal seat to local - it supports Mir and Wayland as well as X. The xlocal...

diff --git a/data/lightdm.conf b/data/lightdm.conf
index ddc2229035e4a2b34b5494c99c41968abba8d5a7..72d1f0bbef3c837a0e79cf52531a139abcdc09a9 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -42,7 +42,7 @@
 # [Seat:seat0] matches the seat named "seat0".
 # [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
 #
-# type = Seat type (xlocal, xremote, unity)
+# type = Seat type (local, xremote, unity)
 # pam-service = PAM service to use for login
 # pam-autologin-service = PAM service to use for autologin
 # pam-greeter-service = PAM service to use for greeters
@@ -85,7 +85,7 @@
 # exit-on-failure = True if the daemon should exit if this seat fails
 #
 [Seat:*]
-#type=xlocal
+#type=local
 #pam-service=lightdm
 #pam-autologin-service=lightdm-autologin
 #pam-greeter-service=lightdm-greeter

diff --git a/po/lightdm.pot b/po/lightdm.pot
index 825e13a55a3ebb1db7e3f0524855e242a5c34630..d788c91535bd1c8c713ffbaf07781dea9b58bc20 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-01 12:01+1200\n"
+"POT-Creation-Date: 2016-06-20 12:03+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"
@@ -18,57 +18,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Help string for command line --config flag
-#: ../src/lightdm.c:1187
+#: ../src/lightdm.c:1198
 msgid "Use configuration file"
 msgstr ""
 
 #. Help string for command line --debug flag
-#: ../src/lightdm.c:1190
+#: ../src/lightdm.c:1201
 msgid "Print debugging messages"
 msgstr ""
 
 #. Help string for command line --test-mode flag
-#: ../src/lightdm.c:1193
+#: ../src/lightdm.c:1204
 msgid "Run as unprivileged user, skipping things that require root access"
 msgstr ""
 
 #. Help string for command line --pid-file flag
-#: ../src/lightdm.c:1196
+#: ../src/lightdm.c:1207
 msgid "File to write PID into"
 msgstr ""
 
 #. Help string for command line --log-dir flag
-#: ../src/lightdm.c:1199
+#: ../src/lightdm.c:1210
 msgid "Directory to write logs to"
 msgstr ""
 
 #. Help string for command line --run-dir flag
-#: ../src/lightdm.c:1202
+#: ../src/lightdm.c:1213
 msgid "Directory to store running state"
 msgstr ""
 
 #. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:1205
+#: ../src/lightdm.c:1216
 msgid "Directory to cache information"
 msgstr ""
 
 #. Help string for command line --show-config flag
-#: ../src/lightdm.c:1208
+#: ../src/lightdm.c:1219
 msgid "Show combined configuration"
 msgstr ""
 
 #. Help string for command line --version flag
-#: ../src/lightdm.c:1211
+#: ../src/lightdm.c:1222
 msgid "Show release version"
 msgstr ""
 
 #. Arguments and description for --help test
-#: ../src/lightdm.c:1230
+#: ../src/lightdm.c:1241
 msgid "- Display Manager"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:1240
+#: ../src/lightdm.c:1251
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""

diff --git a/src/Makefile.am b/src/Makefile.am
index dc6d40dcf189c57c1478c68e75f77f2a007b9617..abf506425a380eacd5ad11a362010c61bde668b0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,12 +29,12 @@ lightdm_SOURCES = \
        process.h \
        seat.c \
        seat.h \
+       seat-local.c \
+       seat-local.h \
        seat-unity.c \
        seat-unity.h \
        seat-xdmcp-session.c \
        seat-xdmcp-session.h \
-       seat-xlocal.c \
-       seat-xlocal.h \
        seat-xremote.c \
        seat-xremote.h \
        seat-xvnc.c \

diff --git a/src/display-manager.c b/src/display-manager.c
index af9f43a469925385c5d0c7bd17dd8be7ed801814..512d4ce92f1f83478de3979ed8995627481b9ea7 100644 (file)
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -17,7 +17,7 @@
 
 #include "display-manager.h"
 #include "configuration.h"
-#include "seat-xlocal.h"
+#include "seat-local.h"
 #include "seat-xremote.h"
 #include "seat-unity.h"
 #include "plymouth.h"
@@ -162,7 +162,7 @@ display_manager_init (DisplayManager *manager)
     manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, DISPLAY_MANAGER_TYPE, DisplayManagerPrivate);
 
     /* Load the seat modules */
-    seat_register_module ("xlocal", SEAT_XLOCAL_TYPE);
+    seat_register_module ("local", SEAT_LOCAL_TYPE);
     seat_register_module ("xremote", SEAT_XREMOTE_TYPE);
     seat_register_module ("unity", SEAT_UNITY_TYPE);
 }

diff --git a/src/lightdm.c b/src/lightdm.c
index 714f86fc33c92775114fc2507ef0f62423c804e2..6e24152240d4956dd7b3944750fa447c1aeaf323 100644 (file)
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -218,6 +218,17 @@ display_manager_stopped_cb (DisplayManager *display_manager)
     g_main_loop_quit (loop);
 }
 
+static Seat *
+create_seat (const gchar *module_name, const gchar *name)
+{
+    if (strcmp (module_name, "xlocal") == 0) {
+        g_warning ("Seat type 'xlocal' is deprecated, use 'type=local' instead");
+        return seat_new ("local", name);
+    }
+    else
+        return seat_new (module_name, name);
+}
+
 static void
 display_manager_seat_removed_cb (DisplayManager *display_manager, Seat *seat)
 {
@@ -237,7 +248,7 @@ display_manager_seat_removed_cb (DisplayManager *display_manager, Seat *seat)
 
         if (!next_seat)
         {
-            next_seat = seat_new (*iter, seat_get_name (seat));
+            next_seat = create_seat (*iter, seat_get_name (seat));
             g_string_assign (next_types, *iter);
         }
         else
@@ -354,7 +365,7 @@ handle_display_manager_call (GDBusConnection       *connection,
 
         g_debug ("Adding local X seat :%d", display_number);
 
-        seat = seat_new ("xremote", "xremote0"); // FIXME: What to use for a name?
+        seat = create_seat ("xremote", "xremote0"); // FIXME: What to use for a name?
         if (seat)
         {
             gchar *display_number_string;
@@ -1020,7 +1031,7 @@ add_login1_seat (Login1Seat *login1_seat)
     g_list_free_full (config_sections, g_free);
 
     for (type = types; !seat && type && *type; type++)
-        seat = seat_new (*type, seat_name);
+        seat = create_seat (*type, seat_name);
     g_strfreev (types);
 
     if (seat)
@@ -1397,7 +1408,7 @@ main (int argc, char **argv)
     if (!config_has_key (config_get_instance (), "LightDM", "backup-logs"))
         config_set_boolean (config_get_instance (), "LightDM", "backup-logs", TRUE);
     if (!config_has_key (config_get_instance (), "Seat:*", "type"))
-        config_set_string (config_get_instance (), "Seat:*", "type", "xlocal");
+        config_set_string (config_get_instance (), "Seat:*", "type", "local");
     if (!config_has_key (config_get_instance (), "Seat:*", "pam-service"))
         config_set_string (config_get_instance (), "Seat:*", "pam-service", "lightdm");
     if (!config_has_key (config_get_instance (), "Seat:*", "pam-autologin-service"))
@@ -1531,7 +1542,7 @@ main (int argc, char **argv)
             types = config_get_string_list (config_get_instance (), "Seat:*", "type");
             for (type = types; type && *type; type++)
             {
-                seat = seat_new (*type, "seat0");
+                seat = create_seat (*type, "seat0");
                 if (seat)
                     break;
             }

diff --git a/src/seat-xlocal.c b/src/seat-local.c
similarity index 80%
rename from src/seat-xlocal.c
rename to src/seat-local.c
index 765c9e80e8a7fb9c5e50e24486579ef1230f0e1e..43fd21ded2bdc83beddf79ca87840c4431997290 100644 (file)
--- a/src/seat-xlocal.c
+++ b/src/seat-local.c
@@ -11,7 +11,7 @@
 
 #include <string.h>
 
-#include "seat-xlocal.h"
+#include "seat-local.h"
 #include "configuration.h"
 #include "x-server-local.h"
 #include "x-server-xmir.h"
@@ -20,7 +20,7 @@
 #include "plymouth.h"
 #include "vt.h"
 
-struct SeatXLocalPrivate
+struct SeatLocalPrivate
 {
     /* System compositor being used for Mir sessions */
     UnitySystemCompositor *compositor;
@@ -35,27 +35,27 @@ struct SeatXLocalPrivate
     XServerLocal *xdmcp_x_server;
 };
 
-G_DEFINE_TYPE (SeatXLocal, seat_xlocal, SEAT_TYPE);
+G_DEFINE_TYPE (SeatLocal, seat_local, SEAT_TYPE);
 
-static XServerLocal *create_x_server (SeatXLocal *seat);
+static XServerLocal *create_x_server (SeatLocal *seat);
 
 static void
-seat_xlocal_setup (Seat *seat)
+seat_local_setup (Seat *seat)
 {
     seat_set_supports_multi_session (seat, TRUE);
     seat_set_share_display_server (seat, seat_get_boolean_property (seat, "xserver-share"));
-    SEAT_CLASS (seat_xlocal_parent_class)->setup (seat);
+    SEAT_CLASS (seat_local_parent_class)->setup (seat);
 }
 
 static void
-check_stopped (SeatXLocal *seat)
+check_stopped (SeatLocal *seat)
 {
     if (!seat->priv->xdmcp_x_server)
-        SEAT_CLASS (seat_xlocal_parent_class)->stop (SEAT (seat));
+        SEAT_CLASS (seat_local_parent_class)->stop (SEAT (seat));
 }
 
 static void
-xdmcp_x_server_stopped_cb (DisplayServer *display_server, SeatXLocal *seat)
+xdmcp_x_server_stopped_cb (DisplayServer *display_server, SeatLocal *seat)
 {
     l_debug (seat, "XDMCP X server stopped");
 
@@ -69,7 +69,7 @@ xdmcp_x_server_stopped_cb (DisplayServer *display_server, SeatXLocal *seat)
 }
 
 static void
-compositor_stopped_cb (UnitySystemCompositor *compositor, SeatXLocal *seat)
+compositor_stopped_cb (UnitySystemCompositor *compositor, SeatLocal *seat)
 {
     l_debug (seat, "Compositor stopped");
 
@@ -80,7 +80,7 @@ compositor_stopped_cb (UnitySystemCompositor *compositor, SeatXLocal *seat)
 }  
 
 static gboolean
-seat_xlocal_start (Seat *seat)
+seat_local_start (Seat *seat)
 {
     const gchar *xdmcp_manager = NULL;
 
@@ -88,7 +88,7 @@ seat_xlocal_start (Seat *seat)
     xdmcp_manager = seat_get_string_property (seat, "xdmcp-manager");
     if (xdmcp_manager)
     {
-        SeatXLocal *s = SEAT_XLOCAL (seat);
+        SeatLocal *s = SEAT_LOCAL (seat);
         const gchar *key_name = NULL;
         gint port = 0;
 
@@ -135,7 +135,7 @@ seat_xlocal_start (Seat *seat)
         return display_server_start (DISPLAY_SERVER (s->priv->xdmcp_x_server));
     }
 
-    return SEAT_CLASS (seat_xlocal_parent_class)->start (seat);
+    return SEAT_CLASS (seat_local_parent_class)->start (seat);
 }
 
 static void
@@ -156,7 +156,7 @@ display_server_transition_plymouth_cb (DisplayServer *display_server, Seat *seat
 }
 
 static gint
-get_vt (SeatXLocal *seat, DisplayServer *display_server)
+get_vt (SeatLocal *seat, DisplayServer *display_server)
 {
     gint vt = -1;
     const gchar *xdg_seat = seat_get_name (SEAT (seat));
@@ -187,7 +187,7 @@ get_vt (SeatXLocal *seat, DisplayServer *display_server)
 }
 
 static UnitySystemCompositor *
-create_unity_system_compositor (SeatXLocal *seat)
+create_unity_system_compositor (SeatLocal *seat)
 {
     UnitySystemCompositor *compositor;
     const gchar *command;
@@ -212,7 +212,7 @@ create_unity_system_compositor (SeatXLocal *seat)
 }
 
 static UnitySystemCompositor *
-get_unity_system_compositor (SeatXLocal *seat)
+get_unity_system_compositor (SeatLocal *seat)
 {
     if (seat->priv->compositor)
         return seat->priv->compositor;
@@ -225,7 +225,7 @@ get_unity_system_compositor (SeatXLocal *seat)
 }
 
 static XServerLocal *
-create_x_server (SeatXLocal *seat)
+create_x_server (SeatLocal *seat)
 {
     const gchar *x_server_backend;
     XServerLocal *x_server;
@@ -242,7 +242,7 @@ create_x_server (SeatXLocal *seat)
         const gchar *command;
         gchar *id;
 
-        compositor = get_unity_system_compositor (SEAT_XLOCAL (seat));
+        compositor = get_unity_system_compositor (SEAT_LOCAL (seat));
         x_server = X_SERVER_LOCAL (x_server_xmir_new (compositor));
 
         command = seat_get_string_property (SEAT (seat), "xmir-command");
@@ -302,7 +302,7 @@ create_x_server (SeatXLocal *seat)
 }
 
 static DisplayServer *
-create_wayland_session (SeatXLocal *seat)
+create_wayland_session (SeatLocal *seat)
 {
     WaylandSession *session;
     gint vt;
@@ -317,9 +317,9 @@ create_wayland_session (SeatXLocal *seat)
 }
 
 static DisplayServer *
-seat_xlocal_create_display_server (Seat *s, Session *session)
+seat_local_create_display_server (Seat *s, Session *session)
 {
-    SeatXLocal *seat = SEAT_XLOCAL (s);
+    SeatLocal *seat = SEAT_LOCAL (s);
     const gchar *session_type;
 
     session_type = session_get_session_type (session);
@@ -349,40 +349,40 @@ seat_xlocal_create_display_server (Seat *s, Session *session)
 }
 
 static gboolean
-seat_xlocal_display_server_is_used (Seat *seat, DisplayServer *display_server)
+seat_local_display_server_is_used (Seat *seat, DisplayServer *display_server)
 {
-    if (display_server == DISPLAY_SERVER (SEAT_XLOCAL (seat)->priv->compositor))
+    if (display_server == DISPLAY_SERVER (SEAT_LOCAL (seat)->priv->compositor))
         return TRUE;
 
-    return SEAT_CLASS (seat_xlocal_parent_class)->display_server_is_used (seat, display_server);
+    return SEAT_CLASS (seat_local_parent_class)->display_server_is_used (seat, display_server);
 }
 
 static GreeterSession *
-seat_xlocal_create_greeter_session (Seat *seat)
+seat_local_create_greeter_session (Seat *seat)
 {
     GreeterSession *greeter_session;
 
-    greeter_session = SEAT_CLASS (seat_xlocal_parent_class)->create_greeter_session (seat);
+    greeter_session = SEAT_CLASS (seat_local_parent_class)->create_greeter_session (seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat));
 
     return greeter_session;
 }
 
 static Session *
-seat_xlocal_create_session (Seat *seat)
+seat_local_create_session (Seat *seat)
 {
     Session *session;
 
-    session = SEAT_CLASS (seat_xlocal_parent_class)->create_session (seat);
+    session = SEAT_CLASS (seat_local_parent_class)->create_session (seat);
     session_set_env (SESSION (session), "XDG_SEAT", seat_get_name (seat));
 
     return session;
 }
 
 static void
-seat_xlocal_set_active_session (Seat *s, Session *session)
+seat_local_set_active_session (Seat *s, Session *session)
 {
-    SeatXLocal *seat = SEAT_XLOCAL (s);
+    SeatLocal *seat = SEAT_LOCAL (s);
     DisplayServer *display_server;
 
     display_server = session_get_display_server (session);
@@ -403,13 +403,13 @@ seat_xlocal_set_active_session (Seat *s, Session *session)
         seat->priv->active_compositor_session = g_object_ref (session);
     }
 
-    SEAT_CLASS (seat_xlocal_parent_class)->set_active_session (s, session);
+    SEAT_CLASS (seat_local_parent_class)->set_active_session (s, session);
 }
 
 static Session *
-seat_xlocal_get_active_session (Seat *s)
+seat_local_get_active_session (Seat *s)
 {
-    SeatXLocal *seat = SEAT_XLOCAL (s);
+    SeatLocal *seat = SEAT_LOCAL (s);
     gint vt;
     GList *link;
 
@@ -436,7 +436,7 @@ seat_xlocal_get_active_session (Seat *s)
 }
 
 static void
-seat_xlocal_set_next_session (Seat *seat, Session *session)
+seat_local_set_next_session (Seat *seat, Session *session)
 {
     DisplayServer *display_server;
     const gchar *id = NULL;
@@ -454,16 +454,16 @@ seat_xlocal_set_next_session (Seat *seat, Session *session)
     if (id)
     {
         l_debug (seat, "Marking Mir session %s as the next session", id);
-        unity_system_compositor_set_next_session (SEAT_XLOCAL (seat)->priv->compositor, id);
+        unity_system_compositor_set_next_session (SEAT_LOCAL (seat)->priv->compositor, id);
     }
     else
         l_debug (seat, "Failed to work out session ID to mark");
 
-    SEAT_CLASS (seat_xlocal_parent_class)->set_next_session (seat, session);
+    SEAT_CLASS (seat_local_parent_class)->set_next_session (seat, session);
 }
 
 static void
-seat_xlocal_run_script (Seat *seat, DisplayServer *display_server, Process *script)
+seat_local_run_script (Seat *seat, DisplayServer *display_server, Process *script)
 {
     if (IS_X_SERVER_LOCAL (display_server))
     {
@@ -476,13 +476,13 @@ seat_xlocal_run_script (Seat *seat, DisplayServer *display_server, Process *scri
         process_set_env (script, "XAUTHORITY", path);
     }
 
-    SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display_server, script);
+    SEAT_CLASS (seat_local_parent_class)->run_script (seat, display_server, script);
 }
 
 static void
-seat_xlocal_stop (Seat *s)
+seat_local_stop (Seat *s)
 {
-    SeatXLocal *seat = SEAT_XLOCAL (s);
+    SeatLocal *seat = SEAT_LOCAL (s);
 
     /* Stop the compositor */
     if (seat->priv->compositor)
@@ -496,15 +496,15 @@ seat_xlocal_stop (Seat *s)
 }
 
 static void
-seat_xlocal_init (SeatXLocal *seat)
+seat_local_init (SeatLocal *seat)
 {
-    seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_XLOCAL_TYPE, SeatXLocalPrivate);
+    seat->priv = G_TYPE_INSTANCE_GET_PRIVATE (seat, SEAT_LOCAL_TYPE, SeatLocalPrivate);
 }
 
 static void
-seat_xlocal_finalize (GObject *object)
+seat_local_finalize (GObject *object)
 {
-    SeatXLocal *seat = SEAT_XLOCAL (object);
+    SeatLocal *seat = SEAT_LOCAL (object);
 
     g_clear_object (&seat->priv->compositor);
     g_clear_object (&seat->priv->active_compositor_session);
@@ -514,28 +514,28 @@ seat_xlocal_finalize (GObject *object)
         g_object_unref (seat->priv->xdmcp_x_server);
     }
 
-    G_OBJECT_CLASS (seat_xlocal_parent_class)->finalize (object);
+    G_OBJECT_CLASS (seat_local_parent_class)->finalize (object);
 }
 
 static void
-seat_xlocal_class_init (SeatXLocalClass *klass)
+seat_local_class_init (SeatLocalClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     SeatClass *seat_class = SEAT_CLASS (klass);
 
-    object_class->finalize = seat_xlocal_finalize;
-
-    seat_class->setup = seat_xlocal_setup;
-    seat_class->start = seat_xlocal_start;
-    seat_class->create_display_server = seat_xlocal_create_display_server;
-    seat_class->display_server_is_used = seat_xlocal_display_server_is_used;
-    seat_class->create_greeter_session = seat_xlocal_create_greeter_session;
-    seat_class->create_session = seat_xlocal_create_session;
-    seat_class->set_active_session = seat_xlocal_set_active_session;
-    seat_class->get_active_session = seat_xlocal_get_active_session;
-    seat_class->set_next_session = seat_xlocal_set_next_session;
-    seat_class->run_script = seat_xlocal_run_script;
-    seat_class->stop = seat_xlocal_stop;
-
-    g_type_class_add_private (klass, sizeof (SeatXLocalPrivate));
+    object_class->finalize = seat_local_finalize;
+
+    seat_class->setup = seat_local_setup;
+    seat_class->start = seat_local_start;
+    seat_class->create_display_server = seat_local_create_display_server;
+    seat_class->display_server_is_used = seat_local_display_server_is_used;
+    seat_class->create_greeter_session = seat_local_create_greeter_session;
+    seat_class->create_session = seat_local_create_session;
+    seat_class->set_active_session = seat_local_set_active_session;
+    seat_class->get_active_session = seat_local_get_active_session;
+    seat_class->set_next_session = seat_local_set_next_session;
+    seat_class->run_script = seat_local_run_script;
+    seat_class->stop = seat_local_stop;
+
+    g_type_class_add_private (klass, sizeof (SeatLocalPrivate));
 }

diff --git a/src/seat-xlocal.h b/src/seat-local.h
similarity index 58%
rename from src/seat-xlocal.h
rename to src/seat-local.h
index c60ecdf4df6930eee10bc2a91cda5a35c089560d..6e9679a4915be97f2ffd6d6e54ef4b0ad946e58a 100644 (file)
--- a/src/seat-xlocal.h
+++ b/src/seat-local.h
@@ -9,32 +9,32 @@
  * license.
  */
 
-#ifndef SEAT_XLOCAL_H_
-#define SEAT_XLOCAL_H_
+#ifndef SEAT_LOCAL_H_
+#define SEAT_LOCAL_H_
 
 #include <glib-object.h>
 #include "seat.h"
 
 G_BEGIN_DECLS
 
-#define SEAT_XLOCAL_TYPE (seat_xlocal_get_type())
-#define SEAT_XLOCAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAT_XLOCAL_TYPE, SeatXLocal))
+#define SEAT_LOCAL_TYPE (seat_local_get_type())
+#define SEAT_LOCAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAT_LOCAL_TYPE, SeatLocal))
 
-typedef struct SeatXLocalPrivate SeatXLocalPrivate;
+typedef struct SeatLocalPrivate SeatLocalPrivate;
 
 typedef struct
 {
-    Seat               parent_instance;
-    SeatXLocalPrivate *priv;
-} SeatXLocal;
+    Seat              parent_instance;
+    SeatLocalPrivate *priv;
+} SeatLocal;
 
 typedef struct
 {
     SeatClass parent_class;
-} SeatXLocalClass;
+} SeatLocalClass;
 
-GType seat_xlocal_get_type (void);
+GType seat_local_get_type (void);
 
 G_END_DECLS
 
-#endif /* SEAT_XLOCAL_H_ */
+#endif /* SEAT_LOCAL_H_ */

diff --git a/src/seat.c b/src/seat.c
index 01bda3826a5d2a8cfd9a49292de4b0dde20462d7..facf7ef9416c05f7592ad3b684fbae17556d5e22 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -294,7 +294,7 @@ seat_get_next_session (Seat *seat)
  * Obtains the active session which lightdm expects to be active.
  *
  * This function is different from seat_get_active_session() in that the
- * later (in the case of xlocal seats) dynamically finds the session that is
+ * later (in the case of local seats) dynamically finds the session that is
  * really active (based on the active VT), whereas this function returns the
  * session that lightdm activated last by itself, which may not be the actual
  * active session (i.e. VT changes).

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b616eb10c905ae3729c6c5d57792e498a00e641a..09084ce34860c2c8c8b5e04c36c20bd032d92449 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,7 @@ TESTS = \
        test-autologin-new-authtok \
        test-autologin-timeout-gobject \
        test-autologin-guest-timeout-gobject \
+       test-xlocal-legacy \
        test-xserver-config \
        test-allow-tcp \
        test-allow-tcp-xorg-1.16 \
@@ -612,7 +613,7 @@ EXTRA_DIST = \
        scripts/wayland-autologin.conf \
        scripts/wayland-greeter.conf \
        scripts/wayland-session.conf \
-       scripts/xauthority.conf \
+       scripts/xauthority.conf \       
        scripts/xdg-current-desktop.conf \
        scripts/xdg-current-desktop-legacy.conf \
        scripts/xdmcp-client.conf \
@@ -637,6 +638,7 @@ EXTRA_DIST = \
        scripts/xdmcp-server-xdm-authentication-no-key.conf \
        scripts/xdmcp-server-xdm-authentication-required.conf \
        scripts/xdmcp-server-xdm-authentication-short-data.conf \
+       scripts/xlocal-legacy.conf \
        scripts/xmir-autologin.conf \
        scripts/xmir-login.conf \
        scripts/xmir-switch.conf \

diff --git a/tests/scripts/unity-compositor-fallback.conf b/tests/scripts/unity-compositor-fallback.conf
index 22f68a03f4e77a11c271ef477bf014ee7c03ca43..8908d174817c4e5e107a89d1874319e58e1ceb6c 100644 (file)
--- a/tests/scripts/unity-compositor-fallback.conf
+++ b/tests/scripts/unity-compositor-fallback.conf
@@ -6,7 +6,7 @@
 return-value=1
 
 [Seat:*]
-type=unity;INVALID;unity;xlocal;
+type=unity;INVALID;unity;local;
 
 #?*START-DAEMON
 #?RUNNER DAEMON-START

diff --git a/tests/scripts/xlocal-legacy.conf b/tests/scripts/xlocal-legacy.conf
new file mode 100644 (file)
index 0000000..61f7994
--- /dev/null
+++ b/tests/scripts/xlocal-legacy.conf
@@ -0,0 +1,31 @@
+#
+# Check legacy xlocal seat still works
+#
+
+[Seat:*]
+type=xlocal
+autologin-user=have-password1
+user-session=default
+
+#?*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
+
+# 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
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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