[mutter/wip/wayland-2: 3/5] core: don't follow any wayland paths if not running as a wl compositor

[Giovanni Campagna <gcampagna src gnome org>]

commit 57f77ac0a424ae6098df99fa1505149cd1c2f1fa
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Mon Jul 15 10:01:30 2013 +0200

    core: don't follow any wayland paths if not running as a wl compositor
    
    If --display-server is not passed, ignore all wayland code paths
    to behave like regular mutter.

 src/core/display.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index ec6a99c..28fb2f3 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2638,7 +2638,8 @@ meta_display_handle_event (MetaDisplay *display,
           {
             MetaWaylandCompositor *compositor =
               meta_wayland_compositor_get_default ();
-            meta_wayland_compositor_set_input_focus (compositor, window);
+            if (meta_is_display_server ())
+              meta_wayland_compositor_set_input_focus (compositor, window);
           }
 #endif
           /* fall through */
@@ -3206,7 +3207,8 @@ event_callback (XEvent  *event,
      position from the surface position. Instead we bypass the
      translation altogether by directly using the Clutter events */
 #ifdef HAVE_WAYLAND
-  if (event->type == MotionNotify)
+  if (event->type == MotionNotify &&
+      meta_is_display_server ())
     return FALSE;
 #endif