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.

diff --git a/ChangeLog b/ChangeLog
index feda4db4d1878f30cb530b468b3ddabcd124e3ea..490a4edb0c3e6bffcd0e49bffe49542f1017055b 100644 (file)
--- 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
index cbee7632323fc98859ab9a0934fe6fba0e47ca9f..61f846c03e67c7a374de605d4a8480d85aab4db8 100644 (file)
--- 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
index 83ea84846d1c3e1c56d760745f18e653950a6e42..98f8947dd965efd5c3b9bca6bc80b1cea5421ce1 100644 (file)
--- 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
index 3d81b2c7e14726f39c85020857f7c2eb7fabbe87..2dd8f37c1b0326bf2f57d5c0f77fea2f70502b67 100644 (file)
--- 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
index 7dd03c5200a0602987936863905db5595b7bc7ab..48d68447a6b479819c82d9b0ad6a89fa4e40c2fd 100644 (file)
--- 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()