xserver: Branch 'server-1.9-branch' - 2 commits

[Jeremy Huddleston]

 Xext/panoramiXprocs.c         |    2 +-
 hw/xquartz/bundle/Makefile.am |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 201273a2b97754d1f9fd672660dcc9c05af29621
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Nov 15 10:57:43 2010 -0800

    XQuartz: Don't use bashism in uninstall-hook
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 8237e0d..8a206cf 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/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/Contents/{Resources,Info.plist,PkgInfo}
+	$(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)
commit 3effb61e207478d92ebbcf5dfc75535cdd2dda12
Author: Linus Arver <linusarver at gmail.com>
Date:   Sun Oct 17 12:26:01 2010 -0700

    Xext: panoramiXprocs: fix typo
    
    This fixes a typo introduced in commit
    80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
    unintentionally to pWin from a copy/paste error. This resulted in all
    QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
    starting up, when Xinerama was enabled.
    
    Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
    
    Signed-off-by: Elie Bleton <drozofil at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    Tested-by: Linus Arver <linusarver at gmail.com>
    (cherry picked from commit 78f94f19aab66a1e5331df0ce29f36e310b4195d)

diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 67b4030..d843168 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
     rep.dstX = x - pDst->drawable.x;
     rep.dstY = y - pDst->drawable.y;
     if((pDst == screenInfo.screens[0]->root) ||
-       (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
+       (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
     {
 	rep.dstX += screenInfo.screens[0]->x;
 	rep.dstY += screenInfo.screens[0]->y;