Add "Cc" to summary and bump summary version number.

	* camel-folder-summary.c: Add "Cc" to summary and bump summary
	version number.

	* camel-folder-search.c (search_header_contains): make "Cc" a
	searchable header.

svn path=/trunk/; revision=3888

4 files changed, 18 insertions, 2 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 076c57e321..12a3122c8e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-05  Dan Winship  <danw@helixcode.com>
+
+	* camel-folder-summary.c: Add "Cc" to summary and bump summary
+	version number.
+
+	* camel-folder-search.c (search_header_contains): make "Cc" a
+	searchable header.
+
 2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* camel-folder-summary.c (camel_folder_summary_next_uid_string):
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 01dfb6a462..0162de0a80 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -371,6 +371,8 @@ search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, C
 			header = search->current->from;
 		} else if (!strcasecmp(headername, "to")) {
 			header = search->current->to;
+		} else if (!strcasecmp(headername, "cc")) {
+			header = search->current->cc;
 		} else {
 			g_warning("Performing query on unknown header: %s", headername);
 		}
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 6ccf2bc7d5..2bb7ca2a74 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -48,7 +48,7 @@
 extern int strdup_count, malloc_count, free_count;
 #endif
 
-#define CAMEL_FOLDER_SUMMARY_VERSION (5)
+#define CAMEL_FOLDER_SUMMARY_VERSION (6)
 
 struct _CamelFolderSummaryPrivate {
 	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */
@@ -967,6 +967,7 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h)
 	mi->subject = summary_format_string(h, "subject");
 	mi->from = summary_format_address(h, "from");
 	mi->to = summary_format_address(h, "to");
+	mi->cc = summary_format_address(h, "cc");
 	mi->user_flags = NULL;
 	mi->date_sent = header_decode_date(header_raw_find(&h, "date", NULL), NULL);
 	received = header_raw_find(&h, "received", NULL);
@@ -1005,6 +1006,7 @@ message_info_load(CamelFolderSummary *s, FILE *in)
 	camel_folder_summary_decode_string(in, &mi->subject);
 	camel_folder_summary_decode_string(in, &mi->from);
 	camel_folder_summary_decode_string(in, &mi->to);
+	camel_folder_summary_decode_string(in, &mi->cc);
 	mi->content = NULL;
 
 	camel_folder_summary_decode_string(in, &mi->message_id);
@@ -1044,6 +1046,7 @@ message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)
 	camel_folder_summary_encode_string(out, mi->subject);
 	camel_folder_summary_encode_string(out, mi->from);
 	camel_folder_summary_encode_string(out, mi->to);
+	camel_folder_summary_encode_string(out, mi->cc);
 
 	camel_folder_summary_encode_string(out, mi->message_id);
 
@@ -1072,6 +1075,7 @@ message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)
 	g_free(mi->subject);
 	g_free(mi->from);
 	g_free(mi->to);
+	g_free(mi->cc);
 	g_free(mi->message_id);
 	header_references_list_clear(&mi->references);
 	camel_flag_list_free(&mi->user_flags);
@@ -1407,6 +1411,7 @@ message_info_dump(CamelMessageInfo *mi)
 
 	printf("Subject: %s\n", mi->subject);
 	printf("To: %s\n", mi->to);
+	printf("Cc: %s\n", mi->cc);
 	printf("From: %s\n", mi->from);
 	printf("UID: %s\n", mi->uid);
 	printf("Flags: %04x\n", mi->flags & 0xffff);
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index b53d645ad6..50563f9ca7 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -86,8 +86,9 @@ typedef struct _CamelFlag {
 typedef struct {
 	/* public fields */
 	gchar *subject;
-	gchar *to;
 	gchar *from;
+	gchar *to;
+	gchar *cc;
 
 	gchar *uid;
 	guint32 flags;