diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-01 20:00:20 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-02 11:41:26 -0400 |
| commit | af272f2685e2ef92248155d3ad3db200d956b001 (patch) | |
| tree | fef68a27b830f44fd7c924a774d33f7ad0007c0b | |
| parent | 81d033ec738c3e8b9c1153b533bd2f8a896158d7 (diff) | |
| download | mutter-af272f2685e2ef92248155d3ad3db200d956b001.tar.gz | |
xwayland: Move global initialization down
| -rw-r--r-- | src/wayland/meta-xwayland.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index aa4b24df5..543e8ffbc 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -299,10 +299,6 @@ meta_xwayland_start (MetaXWaylandManager *manager, char **env; char *fd_string; - wl_global_create (wl_display, &xserver_interface, - META_XSERVER_VERSION, - manager, bind_xserver); - do { lockfile = create_lockfile (display, &display); @@ -341,6 +337,10 @@ meta_xwayland_start (MetaXWaylandManager *manager, manager->display_index = display; manager->lockfile = lockfile; + wl_global_create (wl_display, &xserver_interface, + META_XSERVER_VERSION, + manager, bind_xserver); + /* We want xwayland to be a wayland client so we make a socketpair to setup a * wayland protocol connection. */ if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0) |