2010-11-28 [colin] 3.7.7cvs7
authorColin Leroy <colin@colino.net>
Sun, 28 Nov 2010 16:57:02 +0000 (16:57 +0000)
committerColin Leroy <colin@colino.net>
Sun, 28 Nov 2010 16:57:02 +0000 (16:57 +0000)
* src/gtk/quicksearch.c
Fix bug #2313, 'CLI quicksearch sometimes returns
the same messages twice'. Patch by Sebastien Bigaret

ChangeLog
PATCHSETS
configure.ac
src/gtk/quicksearch.c

index 8eccbe8..637a4f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-28 [colin]     3.7.7cvs7
+
+       * src/gtk/quicksearch.c
+               Fix bug #2313, 'CLI quicksearch sometimes returns 
+               the same messages twice'. Patch by Sebastien Bigaret
+
 2010-11-25 [paul]      3.7.7cvs6
 
        * src/prefs_common.c
index edf7241..b26ea4d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c;  ) > 3.7.7cvs4.patchset
 ( cvs diff -u -r 1.274.2.318 -r 1.274.2.319 src/mainwindow.c;  ) > 3.7.7cvs5.patchset
 ( cvs diff -u -r 1.204.2.197 -r 1.204.2.198 src/prefs_common.c;  ) > 3.7.7cvs6.patchset
+( cvs diff -u -r 1.1.2.98 -r 1.1.2.99 src/gtk/quicksearch.c;  ) > 3.7.7cvs7.patchset
index 56c533f..c3653f9 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 123a47d..95fb722 100644 (file)
@@ -1597,9 +1597,10 @@ void search_msgs_in_folders(GSList **messages, QuickSearch* quicksearch,
        for (; node != NULL; node = node->next) {
                cur = FOLDER_ITEM(node->data);
                debug_print("in: %s\n",cur->path);
-               search_msgs_in_folder(messages, quicksearch, cur);
                if (cur->node->children)
                        search_msgs_in_folders(messages, quicksearch, cur);
+               else
+                       search_msgs_in_folder(messages, quicksearch, cur);
        }
        *messages = g_slist_reverse(*messages);
 }