# HG changeset patch
# User ib
# Date 1358252533 0
# Node ID 59a6b817a2873a3312219230fe5daedfd55c86c5
# Parent  f6c00eacd81681fa3bf395557c02ceb0c149afbf
Add the 'Mapped' information to wsMapWait().

Remove it from interface.c then.

diff -r f6c00eacd816 -r 59a6b817a287 gui/interface.c
--- a/gui/interface.c	Tue Jan 15 11:54:22 2013 +0000
+++ b/gui/interface.c	Tue Jan 15 12:22:13 2013 +0000
@@ -224,7 +224,6 @@
     if (gtkShowVideoWindow) {
         wsVisibleWindow(&guiApp.videoWindow, wsShowWindow);
 
-            guiApp.videoWindow.Mapped = wsMapped;
             guiInfo.VideoWindow       = True;
 
         if (gtkLoadFullscreen)
diff -r f6c00eacd816 -r 59a6b817a287 gui/wm/ws.c
--- a/gui/wm/ws.c	Tue Jan 15 11:54:22 2013 +0000
+++ b/gui/wm/ws.c	Tue Jan 15 12:22:13 2013 +0000
@@ -499,10 +499,13 @@
 {
     XEvent xev;
 
-    if (win->Property & wsWaitMap)
+    if (win->Property & wsWaitMap) {
         do
             XNextEvent(wsDisplay, &xev);
         while (xev.type != MapNotify || xev.xmap.event != win->WindowID);
+
+        win->Mapped = wsMapped;
+    }
 }
 
 // ----------------------------------------------------------------------------------------------