talons

commit d6502d5e4a4960d69be92568cc31720d0261a5d4
parent f3cb6e22253b2163771faa48269a23c4c715a682
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 28 Nov 2010 16:57:02 +0000

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/quicksearch.c
 | 
3
++-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git 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
diff --git 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.1.2.98 -r 1.1.2.99 src/gtk/quicksearch.c;  ) > 3.7.7cvs7.patchset
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git 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);
-		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);
 }