From a480a76fad23546be630650aed6b84bda7872f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 27 Mar 2013 02:07:14 +0100 Subject: [PATCH] Fix crashes with fontconfig 2.9.0 and newer This resolves Bug 1422 (cherry picked from commit 513dce7c027b6e60627d4ff6d97bc4e9fffcb060) --- kdeui/kactionclasses.cpp | 3 ++- kdeui/kfontcombo.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 9e2241408..e08e086c4 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -1506,12 +1506,13 @@ void KFontAction::setFont( const TQString &family ) // check again to solve an alias FcPattern *pattern = NULL; FcConfig *config = NULL; + FcResult result; TQString realFamily; TQRegExp regExp("[-:]"); pattern = FcNameParse( (unsigned char*) family.ascii() ); FcDefaultSubstitute(pattern); FcConfigSubstitute (config, pattern, FcMatchPattern); - pattern = FcFontMatch(NULL, pattern, NULL); + pattern = FcFontMatch(NULL, pattern, &result); realFamily = (char*)FcNameUnparse(pattern); realFamily.remove(realFamily.find(regExp), realFamily.length()); diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp index 9ef3af912..503b17225 100644 --- a/kdeui/kfontcombo.cpp +++ b/kdeui/kfontcombo.cpp @@ -244,12 +244,13 @@ void KFontCombo::setCurrentFont(const TQString &family) // check again to solve an alias FcPattern *pattern = NULL; FcConfig *config = NULL; + FcResult result; TQString realFamily; TQRegExp regExp("[-:]"); pattern = FcNameParse( (unsigned char*) family.ascii() ); FcDefaultSubstitute(pattern); FcConfigSubstitute (config, pattern, FcMatchPattern); - pattern = FcFontMatch(NULL, pattern, NULL); + pattern = FcFontMatch(NULL, pattern, &result); realFamily = (char*)FcNameUnparse(pattern); realFamily.remove(realFamily.find(regExp), realFamily.length());