diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-01 19:38:05 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-02 11:41:27 -0400 |
| commit | c540ddf59bbcfa91916698ae7b349a21eb359c3c (patch) | |
| tree | 51cd3b312ec6eb56eb23853ad4114748a2f2b40a | |
| parent | a44295599c6b2d18674a581130894a109ea205a5 (diff) | |
| download | mutter-c540ddf59bbcfa91916698ae7b349a21eb359c3c.tar.gz | |
xwayland: Move display_name into choose_xdisplay
| -rw-r--r-- | src/wayland/meta-xwayland.c | 3 |
1 files changed, 1 insertions, 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, |