Merge in X module renaming changes

[sojka/lightdm.git] / src / seat-xdmcp-session.c

diff --git a/src/seat-xdmcp-session.c b/src/seat-xdmcp-session.c
index 479aad6f3bd4b7ff6b266e50c12fd2069a991a0a..b4b268555c7cc8c5e92cc0c8be0239ba6fcbe507 100644 (file)
--- a/src/seat-xdmcp-session.c
+++ b/src/seat-xdmcp-session.c
@@ -13,8 +13,6 @@
 
 #include "seat-xdmcp-session.h"
 #include "x-server-remote.h"
-#include "x-greeter.h"
-#include "x-session.h"
 
 struct SeatXDMCPSessionPrivate
 {
@@ -36,12 +34,18 @@ seat_xdmcp_session_new (XDMCPSession *session)
 }
 
 static DisplayServer *
-seat_xdmcp_session_create_display_server (Seat *seat)
+seat_xdmcp_session_create_display_server (Seat *seat, const gchar *session_type)
 {
     XAuthority *authority;
     gchar *host;
     XServerRemote *x_server;
 
+    if (strcmp (session_type, "x") != 0)
+    {
+        g_warning ("XDMCP seat only supports X display servers, not '%s'", session_type);
+        return NULL;
+    }
+
     authority = xdmcp_session_get_authority (SEAT_XDMCP_SESSION (seat)->priv->session);
     host = g_inet_address_to_string (xdmcp_session_get_address (SEAT_XDMCP_SESSION (seat)->priv->session));
     x_server = x_server_remote_new (host, xdmcp_session_get_display_number (SEAT_XDMCP_SESSION (seat)->priv->session), authority);
@@ -50,18 +54,6 @@ seat_xdmcp_session_create_display_server (Seat *seat)
     return DISPLAY_SERVER (x_server);
 }
 
-static Greeter *
-seat_xdmcp_session_create_greeter_session (Seat *seat)
-{
-    return GREETER (x_greeter_new ());
-}
-
-static Session *
-seat_xdmcp_session_create_session (Seat *seat)
-{
-    return SESSION (x_session_new ());
-}
-
 static void
 seat_xdmcp_session_init (SeatXDMCPSession *seat)
 {
@@ -87,8 +79,6 @@ seat_xdmcp_session_class_init (SeatXDMCPSessionClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     seat_class->create_display_server = seat_xdmcp_session_create_display_server;
-    seat_class->create_greeter_session = seat_xdmcp_session_create_greeter_session;
-    seat_class->create_session = seat_xdmcp_session_create_session;
     object_class->finalize = seat_xdmcp_session_finalize;
 
     g_type_class_add_private (klass, sizeof (SeatXDMCPSessionPrivate));