doc/fcconfig.fncs | 3 +--
src/fccfg.c | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b4a3e834126a3cac7fbf2212087825f886be1f1d
Author: Keith Packard <keithp@xxxxxxxxxxxxxxx>
Date: Sat Nov 3 22:53:12 2007 -0700
Remove references to FcConfigParse and FcConfigLoad.
These functions no longer exist.
diff --git a/doc/fcconfig.fncs b/doc/fcconfig.fncs
index 3c3ea06..0081d06 100644
--- a/doc/fcconfig.fncs
+++ b/doc/fcconfig.fncs
@@ -121,7 +121,6 @@ filesystem.
@PURPOSE@ Get config files
@DESC@
Returns the list of known configuration files used to generate <parameter>config</parameter>.
-Note that this will not include any configuration done with FcConfigParse.
@@
@RET@ char *
@@ -319,6 +318,6 @@ FC_CONFIG_DIR environment variable.
@DESC@
Walks the configuration in 'file' and constructs the internal representation
in 'config'. Any include files referenced from within 'file' will be loaded
-with FcConfigLoad and also parsed. If 'complain' is FcFalse, no warning
+and parsed. If 'complain' is FcFalse, no warning
will be displayed if 'file' does not exist.
@@
commit fc141b492bab23d58d248fc3b6d34bcb9c5faa99
Author: Keith Packard <keithp@xxxxxxxxxxxxxxx>
Date: Sat Nov 3 22:45:31 2007 -0700
Have FcConfigSetCurrent accept the current configuration and simply return
without updating anything.
diff --git a/src/fccfg.c b/src/fccfg.c
index 18a74e7..7b2fad5 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -332,6 +332,9 @@ FcConfigBuildFonts (FcConfig *config)
FcBool
FcConfigSetCurrent (FcConfig *config)
{
+ if (config == _fcConfig)
+ return FcTrue;
+
if (!config->fonts)
if (!FcConfigBuildFonts (config))
return FcFalse;
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
