Add X server can be shared

diff --git a/src/x-server-local.c b/src/x-server-local.c
index 239b7c57a87cf6ca06eb61787b583f5fb2f68a97..ae3481c3bbb972b7950410ab36a70e0d4ab095aa 100644 (file)
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -279,12 +279,6 @@ x_server_local_set_mir_socket (XServerLocal *server, const gchar *socket)
     server->priv->mir_socket = g_strdup (socket);
 }
 
-static gboolean
-x_server_local_get_can_share (DisplayServer *server)
-{
-    return TRUE;
-}
-
 static gint
 x_server_local_get_vt (DisplayServer *server)
 {
@@ -586,7 +580,6 @@ x_server_local_class_init (XServerLocalClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     DisplayServerClass *display_server_class = DISPLAY_SERVER_CLASS (klass);
 
-    display_server_class->get_can_share = x_server_local_get_can_share;
     display_server_class->get_vt = x_server_local_get_vt;
     display_server_class->start = x_server_local_start;
     display_server_class->stop = x_server_local_stop;

diff --git a/src/x-server.c b/src/x-server.c
index c8960ceb449662aeeff3b42c698a55856fec9c09..4a456b4fec7cc0201b4e78cf3c431eb57b7852f8 100644 (file)
--- a/src/x-server.c
+++ b/src/x-server.c
@@ -105,6 +105,12 @@ x_server_get_authority (XServer *server)
     return server->priv->authority;
 }
 
+static gboolean
+x_server_get_can_share (DisplayServer *server)
+{
+    return TRUE;
+}
+
 static gboolean
 x_server_start (DisplayServer *display_server)
 {
@@ -202,6 +208,7 @@ x_server_class_init (XServerClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     DisplayServerClass *display_server_class = DISPLAY_SERVER_CLASS (klass);
 
+    display_server_class->get_can_share = x_server_get_can_share;
     display_server_class->start = x_server_start;
     display_server_class->connect_session = x_server_connect_session;
     display_server_class->disconnect_session = x_server_disconnect_session;