summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tools/gen-script-for-lang-new.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d81dd56..71331165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-05 Behdad Esfahbod <behdad@gnome.org>
+
+ * tools/gen-script-for-lang-new.c (scripts_for_lang), (main):
+ Update to new propsed language enumeration API for fontconfig.
+
2007-11-02 Tor Lillqvist <tml@novell.com>
* pango/pango-utils.c (read_builtin_aliases, pango_load_aliases):
diff --git a/tools/gen-script-for-lang-new.c b/tools/gen-script-for-lang-new.c
index 2ef49859..ba38ae69 100644
--- a/tools/gen-script-for-lang-new.c
+++ b/tools/gen-script-for-lang-new.c
@@ -111,7 +111,7 @@ scripts_for_lang (LangInfo *info)
FcChar32 map[FC_CHARSET_MAP_SIZE];
int i;
- charset = FcCharSetForLang ((const FcChar8 *) info->lang);
+ charset = FcLangGetCharSet ((const FcChar8 *) info->lang);
if (!charset)
return;
@@ -208,6 +208,7 @@ int main (void)
int max_lang_len = 0;
int max_script_len = 0;
+ FcStrSet *langs_set;
FcStrList *langs;
FcChar8* lang;
@@ -222,7 +223,9 @@ int main (void)
script_array = g_array_new (FALSE, FALSE, sizeof (LangInfo));
- langs = FcGetLangs ();
+ langs_set = FcGetLangs ();
+ langs = FcStrListCreate (langs_set);
+ FcStrSetDestroy (langs_set);
while ((lang = FcStrListNext (langs)))
do_lang (script_array, lang);