xserver: Branch 'xwayland'

[Kristian Høgsberg]

 hw/xfree86/xwayland/xwayland-window.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20f13be593a2a0754a41be8975fa375805e443a7
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Wed Dec 4 10:27:07 2013 -0800

    xwayland: Fix re-wrapping of RealizeWindow

diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index c03855c..ee95371 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -110,7 +110,7 @@ xwl_realize_window(WindowPtr window)
 
     screen->RealizeWindow = xwl_screen->RealizeWindow;
     ret = (*screen->RealizeWindow)(window);
-    xwl_screen->RealizeWindow = xwl_screen->RealizeWindow;
+    xwl_screen->RealizeWindow = screen->RealizeWindow;
     screen->RealizeWindow = xwl_realize_window;
 
     if (xwl_screen->flags & XWL_FLAGS_ROOTLESS) {