xserver: Branch 'xorg-server-1.5-apple' - 3 commits

[Jeremy Huddleston]

 configure.ac     |    2 +-
 mfb/mfbscrinit.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e592e4853881f59af9aa6b5ff4bd6abf0a79c52b
Merge: 9a659f9... 88ebde6...
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Oct 7 10:08:22 2008 -0700

    Merge branch 'server-1.5-branch' into xorg-server-1.5-apple

commit 9a659f9355c497183967ba66819eb9ff9c636878
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Oct 7 10:08:14 2008 -0700

    Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
    (cherry picked from commit 6dbfca571f6d214dc456710a60ebbbbd204cdbbd)

diff --git a/configure.ac b/configure.ac
index 7128aaa..c1843b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -697,7 +697,7 @@ else
 	RENDERPROTO="renderproto"
 fi
 
-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] [xtrans >= 1.2.2] [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
commit 88ebde608daaca4793e1b637302899ba65d165ec
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Oct 6 20:10:25 2008 -0700

    Remove usage of mfbChangeWindowAttributes missed in e4d11e58c...

diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index 8873a1b..20ac160 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -173,7 +173,6 @@ mfbSetWindowPixmap(pWin, pPix)
 
 void mfbFillInScreen(ScreenPtr pScreen)
 {
-    pScreen->ChangeWindowAttributes = mfbChangeWindowAttributes;
     pScreen->RealizeWindow = mfbMapWindow;
     pScreen->UnrealizeWindow = mfbUnmapWindow;
     pScreen->DestroyPixmap = mfbDestroyPixmap;