xserver: Branch 'master'

[Daniel Stone]

 hw/xfree86/common/xf86DGA.c |    3 ---
 1 files changed, 3 deletions(-)

New commits:
diff-tree 33a5d9605e3e282f6aa1921d7321a2a12ef02c42 (from 0910540e4322bba72a2fa0a907072eab2547a7b6)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Apr 11 18:28:57 2007 +0300

    XFree86: DGA: Don't call ProcessInputEvents from CloseScreen
    
    By the time CloseScreen gets called, we can't call ProcessInputEvents, as
    the event queue will get unhappy.  So just unregister our hooks instantly,
    and hope that they don't get called.

diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 43db1ee..9474ec8 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -249,14 +249,11 @@ DGACloseScreen(int i, ScreenPtr pScreen)
    DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
    if (XDGAEventBase) {
-       OsBlockSignals();
-       ProcessInputEvents();
        mieqSetHandler(*XDGAEventBase + MotionNotify, NULL);
        mieqSetHandler(*XDGAEventBase + ButtonPress, NULL);
        mieqSetHandler(*XDGAEventBase + ButtonRelease, NULL);
        mieqSetHandler(*XDGAEventBase + KeyPress, NULL);
        mieqSetHandler(*XDGAEventBase + KeyRelease, NULL);
-       OsReleaseSignals();
     }
 
    FreeMarkedVisuals(pScreen);