Move XDMCP client settings into Defaults

3 files changed, 16 insertions, 10 deletions

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 69bdd1c8..723d6586 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -20,36 +20,36 @@ seats=Seat0
 # xserver-command = X server command to run
 # xserver-layout = Layout to pass to X server
 # xserver-config = Config file to pass to X server
+# xserver-key = Authentication key to use for XDM-AUTHENTICATION-1
 # greeter-theme = Greeter theme to use
 # xsession = X session to load by default
 # xsession-wrapper = Wrapper script to run X session with
 # autologin-guest = True to log in as guest by default
 # autologin-user = User to log in with by default (overrides autologin-guest)
 # autologin-user-timeout = Number of seconds to wait before loading default user
+# xdmcp-manager = XDMCP manager to connect to
+# xdmcp-port = XDMCP UDP/IP port to communicate on
 #
 #[Defaults]
 #xserver-command=/usr/bin/X
 #xserver-layout=
 #xserver-config=
+#xserver-key=0x0123456789ABCD
 #greeter-theme=example-gtk-gnome
 #xsession=gnome
 #xsession-wrapper=
 #autologin-guest=false
 #autologin-user=
 #autologin-user-timeout=0
+#xdmcp-manager=
+#xdmcp-port=177
 
 #
 # Seat configuration
 #
-# xdmcp-manager = XDMCP manager to connect to
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# key = Authentication key to use
 # Can override any of the options from defaults e.g. greeter-theme=kde
 #
-[Seat0]
-#xdmcp-manager=
-#xdmcp-port=177
-#key=0x0123456789ABCD
+#[Seat0]
 
 #
 # User manager configuration
diff --git a/src/display-manager.c b/src/display-manager.c
index a6889f32..29e65798 100644
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -112,7 +112,8 @@ display_manager_start (DisplayManager *manager)
 
         g_debug ("Loading seat %s", config_section);
 
-        if (config_has_key (config_get_instance (), config_section, "xdmcp-manager"))
+        if (config_has_key (config_get_instance (), "Defaults", "xdmcp-manager") ||
+            config_has_key (config_get_instance (), config_section, "xdmcp-manager"))
             seat = SEAT (seat_xdmcp_client_new (config_section));
         else
             seat = SEAT (seat_local_new (config_section));
diff --git a/src/seat-xdmcp-client.c b/src/seat-xdmcp-client.c
index 2bef94c0..bdcf90c7 100644
--- a/src/seat-xdmcp-client.c
+++ b/src/seat-xdmcp-client.c
@@ -51,11 +51,16 @@ seat_xdmcp_client_add_display (Seat *seat)
 
     g_debug ("Starting seat %s", SEAT_XDMCP_CLIENT (seat)->priv->config_section);
 
-    xdmcp_manager = config_get_string (config_get_instance (), SEAT_XDMCP_CLIENT (seat)->priv->config_section, "xdmcp-manager");
+    xdmcp_manager = config_get_string (config_get_instance (), "SeatDefaults", "xdmcp-manager");
+    if (!xdmcp_manager)
+        xdmcp_manager = config_get_string (config_get_instance (), SEAT_XDMCP_CLIENT (seat)->priv->config_section, "xdmcp-manager");
     xserver = xserver_new (SEAT_XDMCP_CLIENT (seat)->priv->config_section, XSERVER_TYPE_LOCAL_TERMINAL, xdmcp_manager, xserver_get_free_display_number ());
     g_free (xdmcp_manager);
 
-    port = config_get_integer (config_get_instance (), SEAT_XDMCP_CLIENT (seat)->priv->config_section, "xdmcp-port");
+    if (config_has_key (config_get_instance (), "SeatDefaults", "xdmcp-port"))
+        port = config_get_integer (config_get_instance (), "SeatDefaults", "xdmcp-port");
+    else
+        port = config_get_integer (config_get_instance (), SEAT_XDMCP_CLIENT (seat)->priv->config_section, "xdmcp-port");
     if (port > 0)
         xserver_set_port (xserver, port);
     /*key = config_get_string (config_get_instance (), SEAT_XDMCP_CLIENT (seat)->priv->config_section, "key");