r19602 by craig - #12778: Apply patch 9

[scribus-commit]

Author: craig
Date: Mon Oct 20 22:08:12 2014
New Revision: 19602

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19602
Log:
#12778: Apply patch 9

Modified:
    trunk/Scribus/scribus/scfonts.cpp

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19602&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Mon Oct 20 22:08:12 2014
@@ -772,7 +772,7 @@
 {
 	// All-in-one library setup. Perhaps this should be in
 	// the SCFonts constructor.
-	FcConfig* FcInitLoadConfigAndFonts();
+	FcConfig* config = FcInitLoadConfigAndFonts();
 	// The pattern controls what fonts to match. In this case we want to
 	// match all scalable fonts, but ignore bitmap fonts.
 	FcPattern* pat = FcPatternBuild(NULL,
@@ -784,7 +784,7 @@
 	FcObjectSet* os = FcObjectSetBuild (FC_FILE, (char *) 0);
 	// Now ask fontconfig to retrieve info as specified in 'os' about fonts
 	// matching pattern 'pat'.
-	FcFontSet* fs = FcFontList(0, pat, os);
+	FcFontSet* fs = FcFontList(config, pat, os);
 	FcObjectSetDestroy(os);
 	FcPatternDestroy(pat);
 	// Create the Freetype library