Consolidate Seat.setup and Seat.start for readability

The name "setup" implies early initialization, when it was actually
run just before start.

5 files changed, 11 insertions, 25 deletions

diff --git a/src/seat-local.c b/src/seat-local.c
index 65207145..387d7353 100644
--- a/src/seat-local.c
+++ b/src/seat-local.c
@@ -29,14 +29,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (SeatLocal, seat_local, SEAT_TYPE)
 static XServerLocal *create_x_server (SeatLocal *seat);
 
 static void
-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_local_parent_class)->setup (seat);
-}
-
-static void
 check_stopped (SeatLocal *seat)
 {
     SeatLocalPrivate *priv = seat_local_get_instance_private (seat);
@@ -64,6 +56,9 @@ xdmcp_x_server_stopped_cb (DisplayServer *display_server, SeatLocal *seat)
 static gboolean
 seat_local_start (Seat *seat)
 {
+    seat_set_supports_multi_session (seat, TRUE);
+    seat_set_share_display_server (seat, seat_get_boolean_property (seat, "xserver-share"));
+
     SeatLocalPrivate *priv = seat_local_get_instance_private (SEAT_LOCAL (seat));
 
     /* If running as an XDMCP client then just start an X server */
@@ -348,7 +343,6 @@ seat_local_class_init (SeatLocalClass *klass)
 
     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;
diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 876ee29e..d59db4ff 100644
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -17,11 +17,11 @@
 
 G_DEFINE_TYPE (SeatXRemote, seat_xremote, SEAT_TYPE)
 
-static void
-seat_xremote_setup (Seat *seat)
+static gboolean
+seat_xremote_start (Seat *seat)
 {
     seat_set_supports_multi_session (seat, FALSE);
-    SEAT_CLASS (seat_xremote_parent_class)->setup (seat);
+    return SEAT_CLASS (seat_xremote_parent_class)->start (seat);
 }
 
 static DisplayServer *
@@ -80,7 +80,7 @@ seat_xremote_class_init (SeatXRemoteClass *klass)
 {
     SeatClass *seat_class = SEAT_CLASS (klass);
 
-    seat_class->setup = seat_xremote_setup;
+    seat_class->start = seat_xremote_start;
     seat_class->create_display_server = seat_xremote_create_display_server;
     seat_class->create_greeter_session = seat_xremote_create_greeter_session;
     seat_class->create_session = seat_xremote_create_session;
diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c
index 47658df1..80abd05d 100644
--- a/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@ -36,11 +36,11 @@ SeatXVNC *seat_xvnc_new (GSocket *connection)
     return seat;
 }
 
-static void
-seat_xvnc_setup (Seat *seat)
+static gboolean
+seat_xvnc_start (Seat *seat)
 {
     seat_set_supports_multi_session (seat, FALSE);
-    SEAT_CLASS (seat_xvnc_parent_class)->setup (seat);
+    return SEAT_CLASS (seat_xvnc_parent_class)->start (seat);
 }
 
 static DisplayServer *
@@ -124,7 +124,7 @@ seat_xvnc_class_init (SeatXVNCClass *klass)
     SeatClass *seat_class = SEAT_CLASS (klass);
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    seat_class->setup = seat_xvnc_setup;
+    seat_class->start = seat_xvnc_start;
     seat_class->create_display_server = seat_xvnc_create_display_server;
     seat_class->run_script = seat_xvnc_run_script;
     object_class->finalize = seat_xvnc_session_finalize;
diff --git a/src/seat.c b/src/seat.c
index 9a734845..998acdbb 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -216,7 +216,6 @@ seat_start (Seat *seat)
 
     l_debug (seat, "Starting");
 
-    SEAT_GET_CLASS (seat)->setup (seat);
     priv->started = SEAT_GET_CLASS (seat)->start (seat);
 
     return priv->started;
@@ -1680,11 +1679,6 @@ seat_get_is_stopping (Seat *seat)
     return priv->stopping;
 }
 
-static void
-seat_real_setup (Seat *seat)
-{
-}
-
 static gboolean
 seat_real_start (Seat *seat)
 {
@@ -1942,7 +1936,6 @@ seat_class_init (SeatClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    klass->setup = seat_real_setup;
     klass->start = seat_real_start;
     klass->create_display_server = seat_real_create_display_server;
     klass->display_server_is_used = seat_real_display_server_is_used;
diff --git a/src/seat.h b/src/seat.h
index 56228833..c037295f 100644
--- a/src/seat.h
+++ b/src/seat.h
@@ -40,7 +40,6 @@ typedef struct
 {
     GObjectClass parent_class;
 
-    void (*setup)(Seat *seat);
     gboolean (*start)(Seat *seat);
     DisplayServer *(*create_display_server) (Seat *seat, Session *session);
     gboolean (*display_server_is_used) (Seat *seat, DisplayServer *display_server);