diff options
Diffstat (limited to 'gtk/queryimmodules.c')
-rw-r--r-- | gtk/queryimmodules.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c index ad99169aea..b6eadf0585 100644 --- a/gtk/queryimmodules.c +++ b/gtk/queryimmodules.c @@ -158,29 +158,36 @@ int main (int argc, char **argv) { char **dirs; int i; + GHashTable *dirs_done; path = gtk_rc_get_im_module_path (); g_printf ("# ModulesPath = %s\n#\n", path); dirs = pango_split_file_list (path); + dirs_done = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); for (i=0; dirs[i]; i++) - { - GDir *dir = g_dir_open (dirs[i], 0, NULL); - if (dir) - { - const char *dent; - - while ((dent = g_dir_read_name (dir))) - { - if (g_str_has_suffix (dent, SOEXT)) - error |= query_module (dirs[i], dent); - } - - g_dir_close (dir); - } - } + if (!g_hash_table_lookup (dirs_done, dirs[i])) + { + GDir *dir = g_dir_open (dirs[i], 0, NULL); + if (dir) + { + const char *dent; + + while ((dent = g_dir_read_name (dir))) + { + if (g_str_has_suffix (dent, SOEXT)) + error |= query_module (dirs[i], dent); + } + + g_dir_close (dir); + } + + g_hash_table_insert (dirs_done, dirs[i], GUINT_TO_POINTER (TRUE)); + } + + g_hash_table_destroy (dirs_done); } else { |