svn merge ^/branches/released .

4 files changed, 11 insertions, 9 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 845bde87a..8ea50aa94 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -264,9 +264,6 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
         if (i >= 0)

             dev->ptrfeed->ctrl.threshold = i;

 

-        /* mostly a no-op anyway */

-        (*dev->ptrfeed->CtrlProc)(dev, &dev->ptrfeed->ctrl);

-

         xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",

                             local->name, ((float)dev->ptrfeed->ctrl.num)/

                                          ((float)dev->ptrfeed->ctrl.den));

diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c
index 8adbee9ae..739e49ba4 100644
--- a/xorg-server/hw/xfree86/parser/Input.c
+++ b/xorg-server/hw/xfree86/parser/Input.c
@@ -59,6 +59,7 @@
 #include <xorg-config.h>

 #endif

 

+#include "os.h"

 #include "xf86Parser.h"

 #include "xf86tokens.h"

 #include "Configint.h"

@@ -102,8 +103,10 @@ xf86parseInputSection (void)
 		case DRIVER:

 			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)

 				Error (QUOTE_MSG, "Driver");

-                        if (strcmp(val.str, "keyboard") == 0)

-                            ptr->inp_driver = "kbd";

+                        if (strcmp(val.str, "keyboard") == 0) {

+                            ptr->inp_driver = strdup("kbd");

+                            free(val.str);

+                        }

                         else

 			    ptr->inp_driver = val.str;

 			break;

diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index 85161c38a..ddf344a0f 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -111,8 +111,10 @@ xf86parseInputClassSection(void)
         case DRIVER:

             if (xf86getSubToken(&(ptr->comment)) != STRING)

                 Error(QUOTE_MSG, "Driver");

-            if (strcmp(val.str, "keyboard") == 0)

-                ptr->driver = "kbd";

+            if (strcmp(val.str, "keyboard") == 0) {

+                ptr->driver = strdup("kbd");

+                free(val.str);

+            }

             else

                 ptr->driver = val.str;

             break;

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index bc0d24841..e156be83c 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -1109,7 +1109,7 @@ glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawable
 

   __GLXconfig *config = gc->base.config;

   GLXWinConfig *winConfig = (GLXWinConfig *)config;

-  

+

   GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d", winConfig->pixelFormatIndex);

 

   /*

@@ -1153,7 +1153,7 @@ glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawable
     {

       PIXELFORMATDESCRIPTOR pfd;

       int pixelFormat;

-      

+

       /* convert fbConfig to PFD */

       if (fbConfigToPixelFormat(gc->base.config, &pfd, drawableTypeOverride))

         {