xserver git update 15/11/2010

6 files changed, 5 insertions, 11 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 7d930f0fe..c0cba2994 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1094,7 +1094,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
     const char *pointerMsg = NULL, *keyboardMsg = NULL;

     InputInfoPtr *devs, /* iterator */

             indp;

-    InputInfoRec Pointer, Keyboard;

+    InputInfoRec Pointer = {}, Keyboard = {};

     XF86ConfInputPtr confInput;

     XF86ConfInputRec defPtr, defKbd;

     int count = 0;

diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c
index 8ad7c2e79..24fe4ba0d 100644
--- a/xorg-server/hw/xfree86/parser/Monitor.c
+++ b/xorg-server/hw/xfree86/parser/Monitor.c
@@ -105,7 +105,6 @@ static xf86ConfigSymTabRec TimingTab[] =
 	{TT_HSKEW, "hskew"},

 	{TT_BCAST, "bcast"},

 	{TT_VSCAN, "vscan"},

-	{TT_CUSTOM, "CUSTOM"},

 	{-1, ""},

 };

 

@@ -247,9 +246,6 @@ xf86parseModeLine (void)
 			ptr->ml_vscan = val.num;

 			ptr->ml_flags |= XF86CONF_VSCAN;

 			break;

-		case TT_CUSTOM:

-			ptr->ml_flags |= XF86CONF_CUSTOM;

-			break;

 		case EOF_TOKEN:

 			Error (UNEXPECTED_EOF_MSG, NULL);

 			break;

@@ -370,9 +366,6 @@ xf86parseVerboseMode (void)
 				case TT_DBLSCAN:

 					ptr->ml_flags |= XF86CONF_DBLSCAN;

 					break;

-				case TT_CUSTOM:

-					ptr->ml_flags |= XF86CONF_CUSTOM;

-					break;

 				case EOF_TOKEN:

 					Error (UNEXPECTED_EOF_MSG, NULL);

 					break;

diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index f8c9c3cde..bb7025dc4 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -119,7 +119,6 @@ XF86ConfModuleRec, *XF86ConfModulePtr;
 #define XF86CONF_NCSYNC    0x0100

 #define XF86CONF_HSKEW     0x0200	/* hskew provided */

 #define XF86CONF_BCAST     0x0400

-#define XF86CONF_CUSTOM    0x0800	/* timing numbers customized by editor */

 #define XF86CONF_VSCAN     0x1000

 

 typedef struct

diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index 8c7ea1b28..d91755d7e 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -165,7 +165,6 @@ typedef enum {
     TT_HSKEW,

     TT_BCAST,

     TT_VSCAN,

-    TT_CUSTOM,

 

     /* Module tokens */

     LOAD,

diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am
index 3a09f7427..34598aa6a 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.am
+++ b/xorg-server/hw/xquartz/bundle/Makefile.am
@@ -12,7 +12,9 @@ install-data-hook:
 	$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install

 

 uninstall-hook:

-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app	

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo

 

 noinst_PRE = Info.plist.cpp

 noinst_DATA = $(noinst_PRE:plist.cpp=plist)

diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index e0c07809c..32bb49bf2 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -39,6 +39,7 @@
 #include "inputstr.h"

 #include "exevents.h" /* for button/axes labels */

 #include "xserver-properties.h"

+#include "inpututils.h"

 

 /* Peek the internal button mapping */

 static CARD8 const *g_winMouseButtonMap = NULL;