talons

commit 93d111058b9451bf370a9136f0a01342c2acadba
parent 493257ede9dbf63c6e70365c1e84e2bd329f3165
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 10 Oct 2012 08:33:40 +0000

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.

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

5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2012-10-10 [colin]	3.8.1cvs91
 
 	* src/procmsg.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -4466,3 +4466,4 @@
 ( cvs diff -u -r 1.4.2.10 -r 1.4.2.11 autogen.sh;  ) > 3.8.1cvs89.patchset
 ( cvs diff -u -r 1.149.2.111 -r 1.149.2.112 src/inc.c;  cvs diff -u -r 1.28.2.53 -r 1.28.2.54 src/mbox.c;  cvs diff -u -r 1.11.2.32 -r 1.11.2.33 src/common/smtp.c;  cvs diff -u -r 1.6.2.21 -r 1.6.2.22 src/common/smtp.h;  ) > 3.8.1cvs90.patchset
 ( cvs diff -u -r 1.60.2.65 -r 1.60.2.66 src/procmsg.h;  ) > 3.8.1cvs91.patchset
+( cvs diff -u -r 1.213.2.215 -r 1.213.2.216 src/folder.c;  cvs diff -u -r 1.1.2.116 -r 1.1.2.117 src/gtk/quicksearch.c;  ) > 3.8.1cvs92.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=91
+EXTRA_VERSION=92
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
@@ -4740,17 +4740,16 @@ gint folder_item_search_msgs	(Folder			*folder,
 				 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();
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -584,7 +584,7 @@ static void quicksearch_set_button(GtkButton *button, const gchar *icon, const g
 
 static void quicksearch_error(gpointer data)
 {
-	alertpanel_error(_("Something went wrong during search. Please check you logs."));
+	alertpanel_error(_("Something went wrong during search. Please check your logs."));
 }
 
 QuickSearch *quicksearch_new()