Merge in X module renaming changes

[sojka/lightdm.git] / src / seat-xvnc.c

diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c
index f96b43556f88c76e0a954a6fea2b7854006151cd..2f4ecf7500fd4042e558dfbfe13723971a695664 100644 (file)
--- a/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@ -9,10 +9,10 @@
  * license.
  */
 
+#include <string.h>
+
 #include "seat-xvnc.h"
 #include "x-server-xvnc.h"
-#include "x-greeter.h"
-#include "x-session.h"
 #include "configuration.h"
 
 G_DEFINE_TYPE (SeatXVNC, seat_xvnc, SEAT_TYPE);
@@ -34,11 +34,17 @@ SeatXVNC *seat_xvnc_new (GSocket *connection)
 }
 
 static DisplayServer *
-seat_xvnc_create_display_server (Seat *seat)
+seat_xvnc_create_display_server (Seat *seat, const gchar *session_type)
 {
     XServerXVNC *x_server;
     const gchar *command = NULL;
 
+    if (strcmp (session_type, "x") != 0)
+    {
+        g_warning ("XVNC seat only supports X display servers, not '%s'", session_type);
+        return NULL;
+    }
+  
     x_server = x_server_xvnc_new ();
     x_server_xvnc_set_socket (x_server, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection));
 
@@ -66,18 +72,6 @@ seat_xvnc_create_display_server (Seat *seat)
     return DISPLAY_SERVER (x_server);
 }
 
-static Greeter *
-seat_xvnc_create_greeter_session (Seat *seat)
-{
-    return GREETER (x_greeter_new ());
-}
-
-static Session *
-seat_xvnc_create_session (Seat *seat)
-{
-    return SESSION (x_session_new ());
-}
-
 static void
 seat_xvnc_run_script (Seat *seat, DisplayServer *display_server, Process *script)
 {
@@ -126,8 +120,6 @@ seat_xvnc_class_init (SeatXVNCClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     seat_class->create_display_server = seat_xvnc_create_display_server;
-    seat_class->create_greeter_session = seat_xvnc_create_greeter_session;
-    seat_class->create_session = seat_xvnc_create_session;
     seat_class->run_script = seat_xvnc_run_script;
     object_class->finalize = seat_xdmcp_session_finalize;