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

diff --git a/ChangeLog b/ChangeLog
index 8eccbe8628ee3a0a7e70fdffbe140d254e44eb04..637a4f6300b3f45e22171eab49b2b19485b17365 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
 2010-11-25 [paul]      3.7.7cvs6
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index edf7241f32042915ab22fa9fe370994163e629b8..b26ea4dacb6cbe9ec6374417c690155f0f9c426a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4068,3 +4068,4 @@
 ( 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.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

diff --git a/configure.ac b/configure.ac
index 56c533f4b1bf640bc824072a5202b8a05c2efc83..c3653f907a136692ce5c1d0d18fba970ac7da41d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 123a47d7789ca4922cf75c12f73c27e134ec0ee8..95fb722f85877ae0cc05dafbbe98d847891757c2 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -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);
        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);
                if (cur->node->children)
                        search_msgs_in_folders(messages, quicksearch, cur);

+               else
+                       search_msgs_in_folder(messages, quicksearch, cur);

        }
        *messages = g_slist_reverse(*messages);
 }
        }
        *messages = g_slist_reverse(*messages);
 }