Rename xlocal seat to local - it supports Mir and Wayland as well as X. The xlocal seat type is now an alias for local

Author: robert-ancell

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

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 <[email protected]>\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 ""

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 \

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);
 }

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;
             }