[Commits] imap-thread.c 1.1.4.124 1.1.4.124.2.1

[colin at claws-mail.org]

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

Modified Files:
      Tag: stable_3_9
	imap-thread.c 
Log Message:
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.

Index: imap-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
retrieving revision 1.1.4.124
retrieving revision 1.1.4.124.2.1
diff -u -d -r1.1.4.124 -r1.1.4.124.2.1
--- imap-thread.c	9 Nov 2012 08:29:20 -0000	1.1.4.124
+++ imap-thread.c	21 Nov 2012 11:25:36 -0000	1.1.4.124.2.1
@@ -1591,7 +1591,8 @@
 	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 @@
 		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 @@
 	} 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;