Remove HAVE_WAYLAND ifdefs

Wayland support is always enabled now.

https://bugzilla.gnome.org/show_bug.cgi?id=705497

src/core/display.c

@@ -1906,9 +1906,7 @@ update_focus_window (MetaDisplay   *display,
                      Window         xwindow,
                      gulong         serial)
 {
-#ifdef HAVE_WAYLAND
   MetaWaylandCompositor *compositor;
-#endif
 
   display->focus_serial = serial;
 
@@ -1949,7 +1947,6 @@ update_focus_window (MetaDisplay   *display,
   else
     meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL with serial %lu\n", serial);
 
-#ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor ())
     {
       compositor = meta_wayland_compositor_get_default ();
@@ -1962,7 +1959,6 @@ update_focus_window (MetaDisplay   *display,
       else
         meta_topic (META_DEBUG_FOCUS, "Focus change has no effect, because there is no matching wayland surface");
      }
-#endif
 
   g_object_notify (G_OBJECT (display), "focus-window");
   meta_display_update_active_window_hint (display);
@@ -3246,12 +3242,10 @@ event_callback (XEvent  *event,
      erratically because of the lag between updating the window
      position from the surface position. Instead we bypass the
      translation altogether by directly using the Clutter events */
-#ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor () &&
       event->type == GenericEvent &&
       event->xcookie.evtype == XI_Motion)
     return FALSE;
-#endif
 
   return meta_display_handle_event (display, event);
 }

src/core/main.c

@@ -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));

src/core/screen.c

@@ -45,9 +45,7 @@
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
 #include "core.h"
-#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
-#endif
 #include "meta-cursor-tracker-private.h"
 
 #include <X11/extensions/Xinerama.h>
@@ -675,9 +673,7 @@ meta_screen_new (MetaDisplay *display,
   char buf[128];
   guint32 manager_timestamp;
   gulong current_workspace;
-#ifdef HAVE_WAYLAND
   MetaWaylandCompositor *compositor;
-#endif
   
   replace_current_wm = meta_get_replace_current_wm ();
   
@@ -837,7 +833,6 @@ meta_screen_new (MetaDisplay *display,
   screen->xroot = xroot;
   screen->rect.x = screen->rect.y = 0;
   
-#ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor ())
     {
       compositor = meta_wayland_compositor_get_default ();
@@ -845,7 +840,6 @@ meta_screen_new (MetaDisplay *display,
       screen->rect.height = clutter_actor_get_height (compositor->stage);
     }
   else
-#endif
     {
       screen->rect.width = WidthOfScreen (screen->xscreen);
       screen->rect.height = HeightOfScreen (screen->xscreen);

src/core/window-private.h

@@ -44,9 +44,7 @@
 #include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
-#endif
 
 /* XXX: We should find a nicer approach to deal with the
  * circular dependency we have with the current headers

src/core/window.c

@@ -62,9 +62,7 @@
 
 #include <X11/extensions/Xcomposite.h>
 
-#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
-#endif
 
 /* Windows that unmaximize to a size bigger than that fraction of the workarea
  * will be scaled down to that size (while maintaining aspect ratio).
@@ -853,9 +851,7 @@ meta_window_new_shared (MetaDisplay         *display,
   window->dialog_pid = -1;
 
   window->client_type = client_type;
-#ifdef HAVE_WAYLAND
   window->surface = surface;
-#endif
   window->xwindow = xwindow;
 
   /* this is in window->screen->display, but that's too annoying to
@@ -1375,7 +1371,6 @@ display_notify_window (MetaDisplay *display, MetaWindow *window)
     g_signal_emit_by_name (window->display, "window-marked-urgent", window);
 }
 
-#ifdef HAVE_WAYLAND
 MetaWindow *
 meta_window_new_for_wayland (MetaDisplay        *display,
                              int                 width,
@@ -1447,7 +1442,6 @@ meta_window_new_for_wayland (MetaDisplay        *display,
 
   return window;
 }
-#endif
 
 MetaWindow*
 meta_window_new_with_attrs (MetaDisplay       *display,
@@ -2107,10 +2101,8 @@ meta_window_unmanage (MetaWindow  *window,
       meta_error_trap_pop (window->display);
     }
 
-#ifdef HAVE_WAYLAND
   if (window->surface)
     meta_wayland_surface_free (window->surface);
-#endif
 
   meta_prefs_remove_listener (prefs_changed_callback, window);