Merge with trunk

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

diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c
index de450691ab042f1a80cd3868b992beaaa5aace2b..7966e6ea6bfe4ad8a4b9ff86c4ba38cf22b85e12 100644 (file)
--- a/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@ -9,6 +9,8 @@
  * license.
  */
 
+#include <string.h>
+
 #include "seat-xvnc.h"
 #include "xserver-xvnc.h"
 #include "xgreeter.h"
@@ -34,11 +36,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 *xserver;
     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;
+    }
+  
     xserver = xserver_xvnc_new ();
     xserver_xvnc_set_socket (xserver, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection));