cherry-pick to master

[Jeremy Huddleston]

Hi Keith,

Can you please pull these two commits into master:

6980f77892e0409b44bd8f33ba82e7273c6462a4
7e178ffbed7c8557faf8d471ad275aa2b0365e1d

I'm still waiting on Peter's "best git practices" documentation before  
making my apple feature tree.

Thanks,
Jeremy

commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Oct 13 12:54:56 2009 -0700

     Rootless: src drawable window can now be NULL

     Fix a possible crash when pSrc->pDrawable is NULL.

     Signed-off-by: Colin Harrison <colin.harrison at virgin.net>
     Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>

commit 6980f77892e0409b44bd8f33ba82e7273c6462a4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Oct 13 12:54:11 2009 -0700

     Rootless: Abstract some of the Xplugin specific stuff which has  
crept into rootlessWindow.c

     The rootless extension now directly calls some Xplugin functions,  
and relies
     on types defined in Xplugin.h, which isn't very abstracted :-)

     This patch is a start at abstracting some of the Xplugin specific  
stuff which
     has crept into rootlessWindow.c.  This has been done in a pretty  
mindless fashion,
     without much thought as to if the additions to the generic  
rootless interface are
     the correct ones

     There is some confusion as to if RootlesscolormapCallback()  
returns a Bool or
     xp_error_enum value (not so abstact), but I have no way of  
checking, of finding
     out if Xplugin actually checks the result :-)

     Based on patches from Colin Harrison, Jon Turney and Yaakov  
Selkowitz

     Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
     Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3333 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091013/c1267338/attachment.bin