From c540ddf59bbcfa91916698ae7b349a21eb359c3c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 1 Apr 2014 19:38:05 -0400 Subject: [PATCH] xwayland: Move display_name into choose_xdisplay --- src/wayland/meta-xwayland.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index 1c3f12df6..5321aefcc 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -330,6 +330,7 @@ choose_xdisplay (MetaXWaylandManager *manager) while (1); manager->display_index = display; + manager->display_name = g_strdup_printf (":%d", manager->display_index); manager->lockfile = lockfile; return TRUE; @@ -365,8 +366,6 @@ meta_xwayland_start (MetaXWaylandManager *manager, env = g_environ_setenv (env, "WAYLAND_SOCKET", fd_string, TRUE); g_free (fd_string); - manager->display_name = g_strdup_printf (":%d", manager->display_index); - { GError *error = NULL; gchar *args[] = { XWAYLAND_PATH,