Don't create a default cookie in an X server object

3 files changed, 17 insertions, 8 deletions

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 409c0a46..fa18d796 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -194,6 +194,8 @@ static XServerLocal *
 create_x_server (Seat *seat)
 {
     XServerLocal *x_server;
+    gchar *number;
+    XAuthority *cookie;
     const gchar *command = NULL, *layout = NULL, *config_file = NULL;
     gboolean allow_tcp;
     gchar *id;
@@ -214,6 +216,12 @@ create_x_server (Seat *seat)
     x_server_local_set_mir_socket (x_server, unity_system_compositor_get_socket (SEAT_UNITY (seat)->priv->compositor));
     g_free (id);
 
+    number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (x_server)));
+    cookie = x_authority_new_local_cookie (number);
+    x_server_set_authority (X_SERVER (x_server), cookie);
+    g_free (number);
+    g_object_unref (cookie);
+
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
         x_server_local_set_layout (x_server, layout);
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index e019f647..53154101 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -170,6 +170,8 @@ static XServerLocal *
 create_x_server (Seat *seat)
 {
     XServerLocal *x_server;
+    gchar *number;
+    XAuthority *cookie;
     const gchar *command = NULL, *layout = NULL, *config_file = NULL;
     gboolean allow_tcp;
     gint vt;
@@ -193,6 +195,12 @@ create_x_server (Seat *seat)
     if (command)
         x_server_local_set_command (x_server, command);
 
+    number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (x_server)));
+    cookie = x_authority_new_local_cookie (number);
+    x_server_set_authority (X_SERVER (x_server), cookie);
+    g_free (number);
+    g_object_unref (cookie);
+
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
         x_server_local_set_layout (x_server, layout);
diff --git a/src/x-server-local.c b/src/x-server-local.c
index 31cb7561..e8ece6be 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -206,17 +206,10 @@ XServerLocal *
 x_server_local_new (void)
 {
     XServerLocal *self;
-    gchar *number, *name;
-    XAuthority *cookie;
+    gchar *name;
 
     self = g_object_new (X_SERVER_LOCAL_TYPE, NULL);
 
-    number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (self)));
-    cookie = x_authority_new_local_cookie (number);
-    x_server_set_authority (X_SERVER (self), cookie);
-    g_free (number);
-    g_object_unref (cookie);
-
     name = g_strdup_printf ("x-%d", x_server_get_display_number (X_SERVER (self)));
     display_server_set_name (DISPLAY_SERVER (self), name);
     g_free (name);