diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
| commit | a660c10f0f261b390ada5c3a5d0543088830f070 (patch) | |
| tree | 522977aa2a1be8687b1399e8afa2503daa58821b /fontconfig/src/fccfg.c | |
| parent | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (diff) | |
| parent | 080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (diff) | |
| download | vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.gz vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.bz2 vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'fontconfig/src/fccfg.c')
| -rw-r--r-- | fontconfig/src/fccfg.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index b45d74a23..3f1fa73df 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -1407,6 +1407,7 @@ FcConfigSubstituteWithPat (FcConfig *config, FcEdit *e; FcValueList *l; FcPattern *m; + FcStrSet *strs; if (!config) { @@ -1418,6 +1419,22 @@ FcConfigSubstituteWithPat (FcConfig *config, switch (kind) { case FcMatchPattern: s = config->substPattern; + strs = FcGetDefaultLangs (); + if (strs) + { + FcStrList *l = FcStrListCreate (strs); + FcChar8 *lang; + FcValue v; + + FcStrSetDestroy (strs); + while (l && (lang = FcStrListNext (l))) + { + v.type = FcTypeString; + v.u.s = lang; + FcPatternObjectAddWithBinding (p, FC_LANG_OBJECT, v, FcValueBindingWeak, FcTrue); + } + FcStrListDone (l); + } break; case FcMatchFont: s = config->substFont; |