diff options
Diffstat (limited to 'fontconfig/src/fcxml.c')
| -rw-r--r-- | fontconfig/src/fcxml.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index b8e4469a3..a14606821 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -2042,6 +2042,7 @@ FcParseInclude (FcConfigParse *parse) FcChar8 *s; const FcChar8 *attr; FcBool ignore_missing = FcFalse; + FcBool deprecated = FcFalse; FcChar8 *prefix = NULL; s = FcStrBufDoneStatic (&parse->pstack->str); @@ -2053,6 +2054,9 @@ FcParseInclude (FcConfigParse *parse) attr = FcConfigGetAttribute (parse, "ignore_missing"); if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue) ignore_missing = FcTrue; + attr = FcConfigGetAttribute (parse, "deprecated"); + if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue) + deprecated = FcTrue; attr = FcConfigGetAttribute (parse, "prefix"); if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0) prefix = FcConfigXdgConfigHome (); @@ -2078,9 +2082,15 @@ FcParseInclude (FcConfigParse *parse) parse->error = FcTrue; else { - attr = FcConfigGetAttribute (parse, "deprecated"); - if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue) - FcConfigMessage (parse, FcSevereWarning, "reading configurations from %s is deprecated.\n", s); + FcChar8 *filename; + + filename = FcConfigFilename(s); + if ((deprecated == FcTrue) && filename) + { + FcConfigMessage (parse, FcSevereWarning, "reading configurations from %s is deprecated.", s); + } + if(filename) + FcStrFree(filename); } FcStrBufDestroy (&parse->pstack->str); |