Rename [Defaults] to [SeatDefaults]

10 files changed, 20 insertions, 20 deletions

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 723d6586..4e3ed71d 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -30,7 +30,7 @@ seats=Seat0
 # xdmcp-manager = XDMCP manager to connect to
 # xdmcp-port = XDMCP UDP/IP port to communicate on
 #
-#[Defaults]
+#[SeatDefaults]
 #xserver-command=/usr/bin/X
 #xserver-layout=
 #xserver-config=
diff --git a/src/display-manager.c b/src/display-manager.c
index 29e65798..297bb471 100644
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -112,7 +112,7 @@ display_manager_start (DisplayManager *manager)
 
         g_debug ("Loading seat %s", config_section);
 
-        if (config_has_key (config_get_instance (), "Defaults", "xdmcp-manager") ||
+        if (config_has_key (config_get_instance (), "SeatDefaults", "xdmcp-manager") ||
             config_has_key (config_get_instance (), config_section, "xdmcp-manager"))
             seat = SEAT (seat_xdmcp_client_new (config_section));
         else
diff --git a/src/display.c b/src/display.c
index 9490e1ae..9157e16a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -109,16 +109,16 @@ display_new (const gchar *config_section, XServer *xserver)
 
     self->priv->greeter_user = config_get_string (config_get_instance (), config_section, "greeter-user");
     if (!self->priv->greeter_user)
-        self->priv->greeter_user = config_get_string (config_get_instance (), "Defaults", "greeter-user");
+        self->priv->greeter_user = config_get_string (config_get_instance (), "SeatDefaults", "greeter-user");
     self->priv->greeter_theme = config_get_string (config_get_instance (), config_section, "greeter-theme");
     if (!self->priv->greeter_theme)
-        self->priv->greeter_theme = config_get_string (config_get_instance (), "Defaults", "greeter-theme");
+        self->priv->greeter_theme = config_get_string (config_get_instance (), "SeatDefaults", "greeter-theme");
     self->priv->default_session = config_get_string (config_get_instance (), config_section, "xsession");
     if (!self->priv->default_session)
-        self->priv->default_session = config_get_string (config_get_instance (), "Defaults", "xsession");
+        self->priv->default_session = config_get_string (config_get_instance (), "SeatDefaults", "xsession");
     self->priv->session_wrapper = config_get_string (config_get_instance (), config_section, "xsession-wrapper");
     if (!self->priv->session_wrapper)
-        self->priv->session_wrapper = config_get_string (config_get_instance (), "Defaults", "xsession-wrapper");
+        self->priv->session_wrapper = config_get_string (config_get_instance (), "SeatDefaults", "xsession-wrapper");
 
     return self;
 }
diff --git a/src/lightdm.c b/src/lightdm.c
index 760217d8..155b35f3 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -418,9 +418,9 @@ main(int argc, char **argv)
     g_clear_error (&error);
 
     /* Set default values */
-    config_set_string (config_get_instance (), "Defaults", "xserver-command", default_xserver_command);
-    config_set_string (config_get_instance (), "Defaults", "greeter-theme", default_greeter_theme);
-    config_set_string (config_get_instance (), "Defaults", "xsession", default_xsession);
+    config_set_string (config_get_instance (), "SeatDefaults", "xserver-command", default_xserver_command);
+    config_set_string (config_get_instance (), "SeatDefaults", "greeter-theme", default_greeter_theme);
+    config_set_string (config_get_instance (), "SeatDefaults", "xsession", default_xsession);
     config_set_string (config_get_instance (), "Directories", "log-directory", LOG_DIR);
     config_set_string (config_get_instance (), "Directories", "theme-directory", theme_dir);
     config_set_string (config_get_instance (), "Directories", "theme-engine-directory", theme_engine_dir);
diff --git a/src/seat.c b/src/seat.c
index ee230e82..cd31e4f6 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -48,15 +48,15 @@ seat_load_config (Seat *seat, const gchar *config_section)
 {
     if (config_has_key (config_get_instance (), config_section, "autologin-guest"))
         seat->priv->autologin_guest = config_get_boolean (config_get_instance (), config_section, "autologin-guest");
-    else if (config_has_key (config_get_instance (), "Defaults", "autologin-guest"))
-        seat->priv->autologin_guest = config_get_boolean (config_get_instance (), "Defaults", "autologin-guest");
+    else if (config_has_key (config_get_instance (), "SeatDefaults", "autologin-guest"))
+        seat->priv->autologin_guest = config_get_boolean (config_get_instance (), "SeatDefaults", "autologin-guest");
     seat->priv->autologin_username = config_get_string (config_get_instance (), config_section, "autologin-user");
     if (!seat->priv->autologin_username)
-        seat->priv->autologin_username = config_get_string (config_get_instance (), "Defaults", "autologin-user");
+        seat->priv->autologin_username = config_get_string (config_get_instance (), "SeatDefaults", "autologin-user");
     if (config_has_key (config_get_instance (), config_section, "autologin-user-timeout"))
         seat->priv->autologin_timeout = config_get_integer (config_get_instance (), config_section, "autologin-user-timeout");
     else
-        seat->priv->autologin_timeout = config_get_integer (config_get_instance (), "Defaults", "autologin-user-timeout");
+        seat->priv->autologin_timeout = config_get_integer (config_get_instance (), "SeatDefaults", "autologin-user-timeout");
     if (seat->priv->autologin_timeout < 0)
         seat->priv->autologin_timeout = 0;
 }
diff --git a/src/xserver.c b/src/xserver.c
index 157a7ab7..7ca5fe41 100644
--- a/src/xserver.c
+++ b/src/xserver.c
@@ -130,15 +130,15 @@ xserver_new (const gchar *config_section, XServerType type, const gchar *hostnam
     self->priv->hostname = g_strdup (hostname);
     self->priv->display_number = display_number;
 
-    self->priv->command = config_get_string (config_get_instance (), "Defaults", "xserver-command");
+    self->priv->command = config_get_string (config_get_instance (), "SeatDefaults", "xserver-command");
     if (!self->priv->command)
         self->priv->command = config_get_string (config_get_instance (), config_section, "xserver-command");
 
-    self->priv->layout = config_get_string (config_get_instance (), "Defaults", "layout");
+    self->priv->layout = config_get_string (config_get_instance (), "SeatDefaults", "layout");
     if (!self->priv->layout)
         self->priv->layout = config_get_string (config_get_instance (), config_section, "xserver-layout");
 
-    self->priv->config_file = config_get_string (config_get_instance (), "Defaults", "xserver-config");
+    self->priv->config_file = config_get_string (config_get_instance (), "SeatDefaults", "xserver-config");
     if (!self->priv->config_file)
         self->priv->config_file = config_get_string (config_get_instance (), config_section, "xserver-config");
 
diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index c2b35d9d..9e897279 100644
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -1,7 +1,7 @@
 [LightDM]
 seats=test-seat
 
-[Defaults]
+[SeatDefaults]
 autologin-guest=true
 
 [GuestAccount]
diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index a749f8d3..3638d945 100644
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -1,7 +1,7 @@
 [LightDM]
 seats=test-seat
 
-[Defaults]
+[SeatDefaults]
 autologin-user=alice
 
 [test-session-config]
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index 54e0287f..63c1d01d 100644
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -1,7 +1,7 @@
 [LightDM]
 seats=test-seat
 
-[Defaults]
+[SeatDefaults]
 autologin-user=alice
 
 [test-session-config]
diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index d060c106..d71589ff 100644
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -1,5 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[Defaults]
+[SeatDefaults]
 autologin-user=alice