summaryrefslogtreecommitdiff
path: root/pango/modules.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-08-25 12:31:04 -0400
committerMatthias Clasen <mclasen@redhat.com>2012-08-25 12:31:04 -0400
commit9bbb992671140b840bedb4339f6c326a2ae2c072 (patch)
treef038e20854499995c8f44a8e2125e373ee5f4afb /pango/modules.c
parentcabf22f723f1bad63de7e12052c2d13c67366577 (diff)
downloadpango-9bbb992671140b840bedb4339f6c326a2ae2c072.tar.gz
Forgotten fixup
Make pango actually look in both locations for the module file.
Diffstat (limited to 'pango/modules.c')
-rw-r--r--pango/modules.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/pango/modules.c b/pango/modules.c
index 5875f531..4046d235 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -533,16 +533,20 @@ read_modules (void)
dlloaded_modules = g_hash_table_new (g_str_hash, g_str_equal);
if (!file_str)
- file_str = g_build_filename (pango_get_lib_subdirectory (),
- MODULE_VERSION,
- "modules.cache",
- NULL);
- if (!file_str)
- file_str = g_build_filename (pango_get_sysconf_subdirectory (),
- "pango.modules",
- NULL);
-
- files = pango_split_file_list (file_str);
+ {
+ files = g_new (char *, 3);
+
+ files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
+ "pango.modules",
+ NULL);
+ files[1] = g_build_filename (pango_get_lib_subdirectory (),
+ MODULE_VERSION,
+ "modules.cache",
+ NULL);
+ files[2] = NULL;
+ }
+ else
+ files = pango_split_file_list (file_str);
n = 0;
while (files[n])
@@ -554,7 +558,7 @@ read_modules (void)
if (module_file)
{
const gchar *module_file_dir = g_path_get_dirname (files[n]);
- process_module_file(module_file, module_file_dir);
+ process_module_file (module_file, module_file_dir);
g_free ((gpointer) module_file_dir);
fclose(module_file);
}