xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac                    |    2 +-
 miext/rootless/rootlessWindow.c |   25 ++-----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

New commits:
commit a16048cec08e173ce42a78a77704f5fdfcb4480f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Sep 4 05:18:31 2008 -0700

    XQuartz: Fixed a crash in RootlessNativeWindowMoved

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 9066e0b..05dae80 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -143,38 +143,17 @@ void RootlessNativeWindowMoved (WindowPtr pWin) {
     int sx, sy, err;
     XID vlist[2];
     Mask mask;
-    ClientPtr client, pClient;
+    ClientPtr pClient;
     RootlessWindowRec *winRec;
-
-#ifdef XQUARTZ
-    /* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
-    snprintf(__crashreporter_info__, __crashreporter_info__len,
-             "%s\n\RootlessNativeWindowMoved debug data\npWin=%p\n",
-             __crashreporter_info__base, pWin);
-    ErrorF("RootlessNativeWindowMoved debug data\npWin=%p\n", pWin);
-#endif
     
     winRec = WINREC(pWin);
-
-#ifdef XQUARTZ
-    /* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
-    snprintf(__crashreporter_info__, __crashreporter_info__len, "%swinRec=%p\nwinRec->wid=%d\n", __crashreporter_info__, winRec, winRec ? (int)winRec->wid : 0);
-    ErrorF("winRec=%p\nwinRec->wid=%d\n", winRec, winRec ? (int)winRec->wid : 0);
-#endif
     
     if (xp_get_window_bounds ((xp_window_id)winRec->wid, &bounds) != Success) return;
     
-#ifdef XQUARTZ
-    /* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
-    snprintf(__crashreporter_info__, __crashreporter_info__len, "%spWin->drawable.pScreen=%p\npWin->drawable.pScreen->myNum=%d\n", __crashreporter_info__, pWin->drawable.pScreen, pWin->drawable.pScreen ? pWin->drawable.pScreen->myNum : 0);
-    ErrorF("pWin->drawable.pScreen=%p\npWin->drawable.pScreen->myNum=%d\n", pWin->drawable.pScreen, pWin->drawable.pScreen ? pWin->drawable.pScreen->myNum : 0);
-#endif
-    
     sx = dixScreenOrigins[pWin->drawable.pScreen->myNum].x + darwinMainScreenX;
     sy = dixScreenOrigins[pWin->drawable.pScreen->myNum].y + darwinMainScreenY;
     
     /* Fake up a ConfigureWindow packet to resize the window to the current bounds. */
-    
     vlist[0] = (INT16) bounds.x1 - sx;
     vlist[1] = (INT16) bounds.y1 - sy;
     mask = CWX | CWY;
@@ -190,7 +169,7 @@ void RootlessNativeWindowMoved (WindowPtr pWin) {
      notification-response feedback loops) */
     
     no_configure_window = TRUE;
-    ConfigureWindow (pWin, mask, vlist, client);
+    ConfigureWindow (pWin, mask, vlist, pClient);
     no_configure_window = FALSE;
 }
 
commit c7b35ee5de79a3a065ea2b34ca9f467c42613e31
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Sep 3 15:20:54 2008 -0700

    1.4.2-apple14

diff --git a/configure.ac b/configure.ac
index 4188985..225e39e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE