xwayland: Move display_name into choose_xdisplay

This commit is contained in:
Jasper St. Pierre 2014-04-01 19:38:05 -04:00
parent a44295599c
commit c540ddf59b

View File

@ -330,6 +330,7 @@ choose_xdisplay (MetaXWaylandManager *manager)
while (1); while (1);
manager->display_index = display; manager->display_index = display;
manager->display_name = g_strdup_printf (":%d", manager->display_index);
manager->lockfile = lockfile; manager->lockfile = lockfile;
return TRUE; return TRUE;
@ -365,8 +366,6 @@ meta_xwayland_start (MetaXWaylandManager *manager,
env = g_environ_setenv (env, "WAYLAND_SOCKET", fd_string, TRUE); env = g_environ_setenv (env, "WAYLAND_SOCKET", fd_string, TRUE);
g_free (fd_string); g_free (fd_string);
manager->display_name = g_strdup_printf (":%d", manager->display_index);
{ {
GError *error = NULL; GError *error = NULL;
gchar *args[] = { XWAYLAND_PATH, gchar *args[] = { XWAYLAND_PATH,