[Commits] folder.c 1.213.2.215 1.213.2.216

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv5723/src

Modified Files:
      Tag: gtk2
	folder.c 
Log Message:
2012-10-10 [colin]	3.8.1cvs92

	* src/folder.c
		Fix bug #2744, "Quick search throws bad command 
		argument error on Microsoft Exchange". Fall back
		to local search if folder-specific search fails.
	* src/gtk/quicksearch.c
		Typo fix.

Index: folder.c
===================================================================
RCS file: /home/claws-mail/claws/src/folder.c,v
retrieving revision 1.213.2.215
retrieving revision 1.213.2.216
diff -u -d -r1.213.2.215 -r1.213.2.216
--- folder.c	26 Sep 2012 08:35:39 -0000	1.213.2.215
+++ folder.c	10 Oct 2012 08:33:40 -0000	1.213.2.216
@@ -4740,17 +4740,16 @@
 				 SearchProgressNotify	progress_cb,
 				 gpointer		progress_data)
 {
-	gint result;
+	gint result = -1;
 	
 	folder_item_update_freeze();
 
-	if (folder->klass->search_msgs) {
+	if (folder->klass->search_msgs)
 		result = folder->klass->search_msgs(folder, container,
 				msgs, on_server, predicate, progress_cb, progress_data);
-	} else {
+	if (result < 0)
 		result = folder_item_search_msgs_local(folder, container,
 				msgs, on_server, predicate, progress_cb, progress_data);
-	}
 	
 	folder_item_update_thaw();