isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-17 07:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove HAVE_WAYLAND ifdefs

Browse Source 
Wayland support is always enabled now.

https://bugzilla.gnome.org/show_bug.cgi?id=705497
This commit is contained in:
Giovanni Campagna
2013-08-16 13:54:42 +02:00
parent 91cdfab495
commit bd3d5df9ce
10 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/main.c
View File

@ -55,9 +55,7 @@
#include "session.h"
#include <meta/prefs.h>
#include <meta/compositor.h>
#ifdef HAVE_WAYLAND
#include "meta-wayland-private.h"
#endif
#include <glib-object.h>
#include <gdk/gdkx.h>
@ -350,10 +348,8 @@ meta_finalize (void)
meta_display_close (display,
CurrentTime); /* I doubt correct timestamps matter here */
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
meta_wayland_finalize ();
#endif
}
static int signal_pipe_fds[2] = { -1, -1 };
@ -468,7 +464,6 @@ meta_init (void)
g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
#endif
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
{
/* NB: When running as a hybrid wayland compositor we run our own headless X
@ -476,7 +471,6 @@ meta_init (void)
meta_wayland_init ();
}
else
#endif
meta_select_display (opt_display_name);
meta_set_syncing (opt_sync || (g_getenv ("MUTTER_SYNC") != NULL));