talons

commit 7ba3588f121d99fb87b167ea194ba9669ea41d1a
parent 623212907b9df76c3ae89887b4bdb671b04f17b9
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 21 Nov 2012 09:49:02 +0000

2012-11-21 [colin]	3.9.0cvs18

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/etpan/imap-thread.c
 | 
6
++++--

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-21 [colin]	3.9.0cvs18
+
+	* src/etpan/imap-thread.c
+		Don't set charset on simple searches. Fixes Exchange 2007.
+
 2012-11-20 [colin]	3.9.0cvs17
 
 	* src/prefs_matcher.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4515,3 +4515,4 @@
 ( cvs diff -u -r 1.52.2.91 -r 1.52.2.92 src/prefs_folder_item.c;  ) > 3.9.0cvs15.patchset
 ( cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/gtk/prefswindow.c;  ) > 3.9.0cvs16.patchset
 ( cvs diff -u -r 1.43.2.100 -r 1.43.2.101 src/prefs_matcher.c;  ) > 3.9.0cvs17.patchset
+( cvs diff -u -r 1.1.4.124 -r 1.1.4.125 src/etpan/imap-thread.c;  ) > 3.9.0cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git 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;