talons

commit 8d964f84814b75c2ccd918e98f0acae0f12c6eee
parent 545e65efdf4a51f3a918c537d7c3ca73f05bc4ec
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 26 Sep 2012 08:35:40 +0000

2012-09-26 [colin]	3.8.1cvs75

	* src/folder.c
		Fix body search triggering GUI updates
		for every message when it gets MSG_SCANNED
		set.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folder.c
 | 
12
++++++++++--

4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-26 [colin]	3.8.1cvs75
+
+	* src/folder.c
+		Fix body search triggering GUI updates
+		for every message when it gets MSG_SCANNED
+		set.
+
 2012-09-26 [colin]	3.8.1cvs74
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4449,3 +4449,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/advsearch.c;  ) > 3.8.1cvs72.patchset
 ( cvs diff -u -r 1.1.2.113 -r 1.1.2.114 src/gtk/quicksearch.c;  ) > 3.8.1cvs73.patchset
 ( cvs diff -u -r 1.213.2.213 -r 1.213.2.214 src/folder.c;  cvs diff -u -r 1.87.2.68 -r 1.87.2.69 src/folder.h;  cvs diff -u -r 1.179.2.263 -r 1.179.2.264 src/imap.c;  cvs diff -u -r 1.150.2.129 -r 1.150.2.130 src/procmsg.c;  cvs diff -u -r 1.60.2.64 -r 1.60.2.65 src/procmsg.h;  cvs diff -u -r 1.395.2.454 -r 1.395.2.455 src/summaryview.c;  ) > 3.8.1cvs74.patchset
+( cvs diff -u -r 1.213.2.214 -r 1.213.2.215 src/folder.c;  ) > 3.8.1cvs75.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
@@ -4740,13 +4740,21 @@ gint folder_item_search_msgs	(Folder			*folder,
 				 SearchProgressNotify	progress_cb,
 				 gpointer		progress_data)
 {
+	gint result;
+	
+	folder_item_update_freeze();
+
 	if (folder->klass->search_msgs) {
-		return folder->klass->search_msgs(folder, container,
+		result = folder->klass->search_msgs(folder, container,
 				msgs, on_server, predicate, progress_cb, progress_data);
 	} else {
-		return folder_item_search_msgs_local(folder, container,
+		result = folder_item_search_msgs_local(folder, container,
 				msgs, on_server, predicate, progress_cb, progress_data);
 	}
+	
+	folder_item_update_thaw();
+
+	return result;
 }
 
 MsgNumberList *folder_item_get_number_list(FolderItem *item)