[Xorg-commit] xc/lib/font/fc fserve.c,1.1.4.3,1.1.4.4

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/font/fc
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/font/fc

Modified Files:
      Tag: XORG-CURRENT
	fserve.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: fserve.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fserve.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/fserve.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
+++ b/fserve.c	23 Feb 2004 21:34:46 -0000	1.1.4.4
@@ -25,7 +25,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26 2003/11/22 02:12:37 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */
 
 /*
  * Copyright 1990 Network Computing Devices
@@ -2215,7 +2215,7 @@
 	xfree(ranges);
 
 	/* Now try to reopen the font. */
-	return fs_send_open_font(client, (FontPathElementPtr)0,
+	return fs_send_open_font(client, pfont->fpe,
 				 (Mask)FontReopen, (char *)0, 0,
 				 (fsBitmapFormat)0, (fsBitmapFormatMask)0,
 				 (XID)0, &pfont);