isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Move global initialization down

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-01 20:00:20 -04:00
parent 81d033ec73
commit af272f2685
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/meta-xwayland.c
View File

@ -299,10 +299,6 @@ meta_xwayland_start (MetaXWaylandManager *manager,
char **env; char **env;
char *fd_string; char *fd_string;
wl_global_create (wl_display, &xserver_interface,
META_XSERVER_VERSION,
manager, bind_xserver);
do do
{ {
lockfile = create_lockfile (display, &display); lockfile = create_lockfile (display, &display);
@ -341,6 +337,10 @@ meta_xwayland_start (MetaXWaylandManager *manager,
manager->display_index = display; manager->display_index = display;
manager->lockfile = lockfile; 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 /* We want xwayland to be a wayland client so we make a socketpair to setup a
* wayland protocol connection. */ * wayland protocol connection. */
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0) if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0)