From: Colin Leroy <colin@colino.net>
Date: Wed, 21 Nov 2012 11:25:37 +0000 (+0000)
Subject: 2012-11-21 [colin]	3.9.0cvs7-stable
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=refs%2Fheads%2Fstable_3_9

2012-11-21 [colin]	3.9.0cvs7-stable

	* src/etpan/imap-thread.c
		Backport 3.9.0cvs18: Don't set charset on simple searches.
		Fixes Exchange 2007.
---

diff --git a/ChangeLog b/ChangeLog
index 53d60ec56..076467733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-21 [colin]	3.9.0cvs7-stable
+
+	* src/etpan/imap-thread.c
+		Backport 3.9.0cvs18: Don't set charset on simple searches.
+		Fixes Exchange 2007.
+
 2012-11-18 [colin]	3.9.0cvs6-stable
 
 	* src/foldersel.c
diff --git a/PATCHSETS b/PATCHSETS
index 79124557d..efe2400ca 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4504,3 +4504,4 @@
 ( cvs diff -u -r 1.58.2.51 -r 1.58.2.52 po/de.po;  ) > 3.9.0cvs4-stable.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/advsearch.c;  ) > 3.9.0cvs5-stable.patchset
 ( cvs diff -u -r 1.26.2.49 -r 1.26.2.50 src/foldersel.c;  cvs diff -u -r 1.60.2.83 -r 1.60.2.84 src/prefs_actions.c;  cvs diff -u -r 1.1.4.79 -r 1.1.4.80 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.96 -r 1.43.2.97 src/prefs_matcher.c;  cvs diff -u -r 1.8.2.47 -r 1.8.2.48 src/quote_fmt.c;  cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/description_window.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/description_window.h;  cvs diff -u -r 1.2.2.48 -r 1.2.2.49 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/manage_window.c;  cvs diff -u -r 1.1.2.119 -r 1.1.2.120 src/gtk/quicksearch.c;  ) > 3.9.0cvs6-stable.patchset
+( cvs diff -u -r 1.1.4.124 -r 1.1.4.125 src/etpan/imap-thread.c;  ) > 3.9.0cvs7-stable.patchset
diff --git a/configure.ac b/configure.ac
index 7ed27b070..fafc4b85c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-stable
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 657719ce3..4a1f1fad1 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1591,7 +1591,8 @@ static void search_run(struct etpan_thread_op * op)
 	struct mailimap_search_key * uid_key = NULL;
 	struct mailimap_search_key * search_type_key = NULL;
 	clist * search_result;
-	
+	static const char *charset = NULL;
+
 	param = op->param;
 	result = op->result;
 
@@ -1629,6 +1630,7 @@ static void search_run(struct etpan_thread_op * op)
 		search_type_key = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_JUNK, 0);
 		break;
 	case IMAP_SEARCH_TYPE_KEYED:
+		charset = "UTF-8";
 		search_type_key = param->key;
 		break;
 	}
@@ -1653,7 +1655,7 @@ static void search_run(struct etpan_thread_op * op)
 	} else {
 		mailstream_logger = imap_logger_uid;
 
-		r = mailimap_uid_search(param->imap, "UTF-8", key, &search_result);
+		r = mailimap_uid_search(param->imap, charset, key, &search_result);
 
 		mailstream_logger = imap_logger_cmd;