[MPlayer-cvslog] r34550 - trunk/gui/wm/ws.c

[ib]

Author: ib
Date: Thu Jan 12 17:01:32 2012
New Revision: 34550

Log:
Simplify XShape handling and setting of wsUseXShape.

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jan 12 16:53:20 2012	(r34549)
+++ trunk/gui/wm/ws.c	Thu Jan 12 17:01:32 2012	(r34550)
@@ -273,13 +273,9 @@ void wsXInit(Display *mDisplay)
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_NoXshm);
 
 #ifdef CONFIG_XSHAPE
-
     if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase))
-        wsUseXShape = 0;
-
-#else
-    wsUseXShape = 0;
 #endif
+    wsUseXShape = 0;
 
     if (!wsUseXShape)
         mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);