svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

2 files changed, 10 insertions, 10 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index f1893656f..26ffad825 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -2565,7 +2565,7 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
    

     cl->GLClientmajorVersion = req->major;

     cl->GLClientminorVersion = req->minor;

-    if (cl->GLClientextensions) free(cl->GLClientextensions);

+    free(cl->GLClientextensions);

     buf = (const char *)(req+1);

     cl->GLClientextensions = strdup(buf);

 

diff --git a/xorg-server/hw/dmx/glxProxy/glxext.c b/xorg-server/hw/dmx/glxProxy/glxext.c
index 01cbd6e08..a90c14906 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.c
+++ b/xorg-server/hw/dmx/glxProxy/glxext.c
@@ -77,10 +77,10 @@ static void ResetClientState(int clientIndex)
     Display **keep_be_displays;

     int i;

 

-    if (cl->returnBuf) free(cl->returnBuf);

-    if (cl->currentContexts) free(cl->currentContexts);

-    if (cl->currentDrawables) free(cl->currentDrawables);

-    if (cl->largeCmdBuf) free(cl->largeCmdBuf);

+    free(cl->returnBuf);

+    free(cl->currentContexts);

+    free(cl->currentDrawables);

+    free(cl->largeCmdBuf);

 

     for (i=0; i< screenInfo.numScreens; i++) {

        if (cl->be_displays[i])

@@ -97,7 +97,7 @@ static void ResetClientState(int clientIndex)
     */

     cl->GLClientmajorVersion = 1;

     cl->GLClientminorVersion = 0;

-    if (cl->GLClientextensions) free(cl->GLClientextensions);

+    free(cl->GLClientextensions);

 

     memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));

 }

@@ -222,10 +222,10 @@ GLboolean __glXFreeContext(__GLXcontext *cx)
 {

     if (cx->idExists || cx->isCurrent) return GL_FALSE;

     

-    if (cx->feedbackBuf) free(cx->feedbackBuf);

-    if (cx->selectBuf) free(cx->selectBuf);

-    if (cx->real_ids) free(cx->real_ids);

-    if (cx->real_vids) free(cx->real_vids);

+    free(cx->feedbackBuf);

+    free(cx->selectBuf);

+    free(cx->real_ids);

+    free(cx->real_vids);

 

     if (cx->pGlxPixmap) {

        /*