changeset 5830:5f02d29a2a65

Get the previous patch wrt. FcNameUnparse right. 2014-11-23 Michael Sperber <mike@xemacs.org> * font-mgr.c (Ffc_name_unparse): Do the previous change to this file right and parse the pattern sans the charset.
author Mike Sperber <sperber@deinprogramm.de>
date Sun, 23 Nov 2014 19:26:14 +0100
parents 0303baa7c4e9
children af34373e378f
files src/ChangeLog src/font-mgr.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Nov 10 14:20:19 2014 -0500
+++ b/src/ChangeLog	Sun Nov 23 19:26:14 2014 +0100
@@ -1,3 +1,8 @@
+2014-11-23  Michael Sperber  <mike@xemacs.org>
+
+	* font-mgr.c (Ffc_name_unparse): Do the previous change to this
+	file right and parse the pattern sans the charset.
+
 2014-11-06  Vin Shelton  <acs@xemacs.org>
 
 	* sysdep.c (set_descriptor_non_blocking): Don't call ioctl() on
--- a/src/font-mgr.c	Mon Nov 10 14:20:19 2014 -0500
+++ b/src/font-mgr.c	Sun Nov 23 19:26:14 2014 +0100
@@ -269,7 +269,7 @@
   {
     FcPattern* temp = FcPatternDuplicate (XFC_PATTERN_PTR (pattern));
     FcPatternDel (temp, FC_CHARSET);
-    name = FcNameUnparse (XFC_PATTERN_PTR (pattern));
+    name = FcNameUnparse (temp);
     FcPatternDestroy (temp);
   }
   result = build_fcapi_string (name);