[Commits] imap-thread.c 1.1.4.126 1.1.4.127 imap-thread.h 1.1.4.30 1.1.4.31

[colin at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	imap-thread.c imap-thread.h 
Log Message:
2012-11-28 [colin]	3.9.0cvs26

	* src/imap.c
	* src/etpan/imap-thread.c
	* src/etpan/imap-thread.h
		Try locale's charset and UTF-7 on server-side
		searches when UTF-8 fails. Also, don't even
		mention a charset if searching for an ASCII
		string.

Index: imap-thread.h
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/imap-thread.h,v
retrieving revision 1.1.4.30
retrieving revision 1.1.4.31
diff -u -d -r1.1.4.30 -r1.1.4.31
--- imap-thread.h	27 Sep 2012 14:48:45 -0000	1.1.4.30
+++ imap-thread.h	28 Nov 2012 09:39:37 -0000	1.1.4.31
@@ -137,7 +137,7 @@
 void		imap_search_free(IMAPSearchKey* search);
 
 int imap_threaded_search(Folder * folder, int search_type, IMAPSearchKey* key,
-			 struct mailimap_set * set, clist ** result);
+			 const char *charset, struct mailimap_set * set, clist ** result);
 
 int imap_threaded_fetch_uid(Folder * folder, uint32_t first_index,
 			    carray ** result);

Index: imap-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
retrieving revision 1.1.4.126
retrieving revision 1.1.4.127
diff -u -d -r1.1.4.126 -r1.1.4.127
--- imap-thread.c	23 Nov 2012 19:29:16 -0000	1.1.4.126
+++ imap-thread.c	28 Nov 2012 09:39:37 -0000	1.1.4.127
@@ -1553,6 +1553,7 @@
 struct search_param {
 	mailimap * imap;
 	int type;
+	const char *charset;
 	struct mailimap_set * set;
 	IMAPSearchKey* key;
 };
@@ -1591,7 +1592,6 @@
 	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;
@@ -1630,7 +1630,6 @@
 		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;
 	}
@@ -1655,7 +1654,7 @@
 	} else {
 		mailstream_logger = imap_logger_uid;
 
-		r = mailimap_uid_search(param->imap, charset, key, &search_result);
+		r = mailimap_uid_search(param->imap, param->charset, key, &search_result);
 
 		mailstream_logger = imap_logger_cmd;
 
@@ -1669,7 +1668,8 @@
 }
 
 int imap_threaded_search(Folder * folder, int search_type, IMAPSearchKey* key,
-			 struct mailimap_set * set, clist ** search_result)
+			 const char *charset, struct mailimap_set * set,
+			 clist ** search_result)
 {
 	struct search_param param;
 	struct search_result result;
@@ -1680,6 +1680,7 @@
 	imap = get_imap(folder);
 	param.imap = imap;
 	param.set = set;
+	param.charset = charset;
 	param.type = search_type;
 	param.key = key;