diff options
Diffstat (limited to 'xorg-server/hw/xquartz/applewm.c')
| -rw-r--r-- | xorg-server/hw/xquartz/applewm.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c index 072e57ff4..c72540ace 100644 --- a/xorg-server/hw/xquartz/applewm.c +++ b/xorg-server/hw/xquartz/applewm.c @@ -25,6 +25,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ +#include "sanitizedCarbon.h" + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif @@ -72,8 +74,6 @@ static int WMErrorBase; static DISPATCH_PROC(ProcAppleWMDispatch); static DISPATCH_PROC(SProcAppleWMDispatch); -static void AppleWMResetProc(ExtensionEntry* extEntry); - static unsigned char WMReqCode = 0; static int WMEventBase = 0; @@ -122,7 +122,7 @@ AppleWMExtensionInit( AppleWMNumberErrors, ProcAppleWMDispatch, SProcAppleWMDispatch, - AppleWMResetProc, + NULL, StandardMinorOpcode))) { WMReqCode = (unsigned char)extEntry->base; @@ -133,14 +133,6 @@ AppleWMExtensionInit( } } -/*ARGSUSED*/ -static void -AppleWMResetProc ( - ExtensionEntry* extEntry -) -{ -} - /* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */ void AppleWMSetScreenOrigin( @@ -173,7 +165,11 @@ AppleWMDoReorderWindow( atom = xa_apple_no_order_in(); rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess); - return (rc == Success) && (prop->type == atom); + + if(Success == rc && prop->type == atom) + return 0; + + return 1; } |