xserver: Branch 'master'

[Drew Parsons]

 hw/xprint/ps/psout_ft.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
diff-tree affda73a1d6e291516880dfbcb74b661374524c6 (from 6f44a2c8a8d6e8f95681ebc7b2dd5ad9c3a02c6e)
Author: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>
Date:   Mon Aug 27 00:41:03 2007 +1000

    Xprint: fix handling of TrueType font name
    
    Debian bug #272368
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=272368
    In certain locales, some characters from some TrueType fonts were not
    appearing in the Xprint postscript output due to the font not being
    identified in the postscript output.

diff --git a/hw/xprint/ps/psout_ft.c b/hw/xprint/ps/psout_ft.c
index b10d9e5..30939f9 100644
--- a/hw/xprint/ps/psout_ft.c
+++ b/hw/xprint/ps/psout_ft.c
@@ -280,6 +280,8 @@ PsOut_FreeType_Text16(FontPtr pFont, PsO
       else
       {
         sprintf(buf, "%s", baseFontName);
+        xfree(self->FontName);
+        self->FontName = NULL;
       }
 
       if( self->FontSize == -1 )