From 6f1a9d469cf94f80eca2aeee808b568f8cfabd84 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 20 Aug 2003 22:05:24 +0000 Subject: [PATCH] Don't look at the same directory twice (in simple cases). (#120342) 2003-08-20 Noah Levitt * gtk/queryimmodules.c: Don't look at the same directory twice (in simple cases). (#120342) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/queryimmodules.c | 35 +++++++++++++++++++++-------------- 6 files changed, 46 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26e393c9e5..408868912d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-08-20 Noah Levitt + + * gtk/queryimmodules.c: Don't look at the same directory twice (in + simple cases). (#120342) + Wed Aug 20 22:04:47 2003 Soeren Sandmann * gdk/gdkwindow.c: Make the layers in the paint stack have their diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 26e393c9e5..408868912d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-08-20 Noah Levitt + + * gtk/queryimmodules.c: Don't look at the same directory twice (in + simple cases). (#120342) + Wed Aug 20 22:04:47 2003 Soeren Sandmann * gdk/gdkwindow.c: Make the layers in the paint stack have their diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 26e393c9e5..408868912d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-08-20 Noah Levitt + + * gtk/queryimmodules.c: Don't look at the same directory twice (in + simple cases). (#120342) + Wed Aug 20 22:04:47 2003 Soeren Sandmann * gdk/gdkwindow.c: Make the layers in the paint stack have their diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 26e393c9e5..408868912d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-08-20 Noah Levitt + + * gtk/queryimmodules.c: Don't look at the same directory twice (in + simple cases). (#120342) + Wed Aug 20 22:04:47 2003 Soeren Sandmann * gdk/gdkwindow.c: Make the layers in the paint stack have their diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 26e393c9e5..408868912d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-08-20 Noah Levitt + + * gtk/queryimmodules.c: Don't look at the same directory twice (in + simple cases). (#120342) + Wed Aug 20 22:04:47 2003 Soeren Sandmann * gdk/gdkwindow.c: Make the layers in the paint stack have their 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; + 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); - } - } + 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 {