temporarily reverting camel namespace changes until after other branches have been merged

svn path=/trunk/; revision=22374

4 files changed, 26 insertions, 42 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 6caf503db7..d077cd9316 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,19 +1,3 @@
-2003-08-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer.c (message_rfc822_dnd):
-	s/HSCAN_/CAMEL_MIME_PARSER_STATE_/g
-
-2003-08-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* e-msg-composer-attachment-bar.c: updated for namespace changed
-	made to camel-mime-utils.[c,h]
-
-	* e-msg-composer-attachment.c: updated for namespace changed made
-	to camel-mime-utils.[c,h]
-
-	* e-msg-composer.c: updated for namespace changed made to
-	camel-mime-utils.[c,h]
-
 2003-08-19  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* Original patch from David Woodhouse, but modified a bit by me.
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 479fd99871..7e7d9227c3 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -231,7 +231,7 @@ update (EMsgComposerAttachmentBar *bar)
 		content_type = camel_mime_part_get_content_type (attachment->body);
 		/* Get the image out of the attachment 
 		   and create a thumbnail for it */
-		image = camel_content_type_is (content_type, "image", "*");
+		image = header_content_type_is (content_type, "image", "*");
 		
 		if (image && attachment->pixbuf_cache == NULL) {
 			CamelDataWrapper *wrapper;
@@ -304,7 +304,7 @@ update (EMsgComposerAttachmentBar *bar)
 		} else {
 			char *mime_type;
 			
-			mime_type = camel_content_type_simple (content_type);
+			mime_type = header_content_type_simple (content_type);
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			g_free (mime_type);
 			gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, label);
@@ -725,7 +725,7 @@ attach_to_multipart (CamelMultipart *multipart,
 	content = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
 	
 	if (!CAMEL_IS_MULTIPART (content)) {
-		if (camel_content_type_is (content_type, "text", "*")) {
+		if (header_content_type_is (content_type, "text", "*")) {
 			CamelMimePartEncodingType encoding;
 			CamelStreamFilter *filter_stream;
 			CamelMimeFilterBestenc *bestenc;
@@ -733,7 +733,7 @@ attach_to_multipart (CamelMultipart *multipart,
 			const char *charset;
 			char *type;
 			
-			charset = camel_content_type_param (content_type, "charset");
+			charset = header_content_type_param (content_type, "charset");
 			
 			stream = camel_stream_null_new ();
 			filter_stream = camel_stream_filter_new_with_stream (stream);
@@ -762,8 +762,8 @@ attach_to_multipart (CamelMultipart *multipart,
 			
 			if (!charset) {
 				/* looks kinda nasty, but this is how ya have to do it */
-				camel_content_type_set_param (content_type, "charset", default_charset);
-				type = camel_content_type_format (content_type);
+				header_content_type_set_param (content_type, "charset", default_charset);
+				type = header_content_type_format (content_type);
 				camel_mime_part_set_content_type (attachment->body, type);
 				g_free (type);
 			}
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 5942b51340..fb7fe46073 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -220,7 +220,7 @@ e_msg_composer_attachment_new (const char *file_name,
            workaround, don't set a Content-Id on these parts. Fixes
            bug #10032 */
 	/* set the Content-Id */
-	content_id = camel_header_msgid_generate ();
+	content_id = header_msgid_generate ();
 	camel_mime_part_set_content_id (part, content_id);
 	g_free (content_id);
 #endif
@@ -430,7 +430,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p
 	set_entry (editor_gui, "description_entry",
 		   camel_mime_part_get_description (attachment->body));
 	content_type = camel_mime_part_get_content_type (attachment->body);
-	type = camel_content_type_simple (content_type);
+	type = header_content_type_simple (content_type);
 	set_entry (editor_gui, "mime_type_entry", type);
 	g_free (type);
 	
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 3a4ec93e86..5a78a68a02 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -388,7 +388,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		}
 		data = g_byte_array_new ();
 		g_byte_array_append (data, composer->mime_body, strlen (composer->mime_body));
-		type = camel_content_type_decode (composer->mime_type);
+		type = header_content_type_decode (composer->mime_type);
 	} else {
 		data = get_text (composer->persist_stream_interface, "text/plain");
 		if (!data) {
@@ -399,9 +399,9 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 		
 		/* FIXME: we may want to do better than this... */
 		charset = best_charset (data, composer->charset, &plain_encoding);
-		type = camel_content_type_new ("text", "plain");
+		type = header_content_type_new ("text", "plain");
 		if (charset)
-			camel_content_type_set_param (type, "charset", charset);
+			header_content_type_set_param (type, "charset", charset);
 	}
 	
 	stream = camel_stream_mem_new_with_byte_array (data);
@@ -426,7 +426,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
 	camel_object_unref (stream);
 	
 	camel_data_wrapper_set_mime_type_field (plain, type);
-	camel_content_type_unref (type);
+	header_content_type_unref (type);
 	
 	if (composer->send_html) {
 		CORBA_Environment ev;
@@ -2535,7 +2535,7 @@ message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream)
 	camel_mime_parser_scan_from (mp, TRUE);
 	camel_mime_parser_init_with_stream (mp, stream);
 	
-	while (camel_mime_parser_step (mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM) {
+	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
 		CamelMimeMessage *message;
 		CamelMimePart *part;
 		
@@ -3211,10 +3211,10 @@ add_attachments_handle_mime_part (EMsgComposer *composer, CamelMimePart *mime_pa
 			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
 	} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
 		/* do nothing */
-	} else if (related && camel_content_type_is (content_type, "image", "*")) {
+	} else if (related && header_content_type_is (content_type, "image", "*")) {
 		e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
 	} else {
-		if (camel_content_type_is (content_type, "text", "*")) {
+		if (header_content_type_is (content_type, "text", "*")) {
 			/* do nothing */
 		} else {
 			e_msg_composer_attach (composer, mime_part);
@@ -3231,7 +3231,7 @@ add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipar
 	gboolean related;
 	int i, nparts;
 	
-	related = camel_content_type_is (CAMEL_DATA_WRAPPER (multipart)->mime_type, "multipart", "related");
+	related = header_content_type_is (CAMEL_DATA_WRAPPER (multipart)->mime_type, "multipart", "related");
 		
 	if (CAMEL_IS_MULTIPART_SIGNED (multipart)) {
 		mime_part = camel_multipart_get_part (multipart, CAMEL_MULTIPART_SIGNED_CONTENT);
@@ -3303,14 +3303,14 @@ handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int
 		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
 			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
 			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
+		} else if (header_content_type_is (content_type, "multipart", "alternative")) {
 			/* this contains the text/plain and text/html versions of the message body */
 			handle_multipart_alternative (composer, multipart, depth);
 		} else {
 			/* there must be attachments... */
 			handle_multipart (composer, multipart, depth);
 		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
+	} else if (header_content_type_is (content_type, "text", "*")) {
 		char *text;
 		
 		if ((text = mail_get_message_body (content, FALSE, FALSE)))
@@ -3360,14 +3360,14 @@ handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, i
 		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
 			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
 			handle_multipart_encrypted (composer, multipart, depth);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
+		} else if (header_content_type_is (content_type, "multipart", "alternative")) {
 			/* this contains the text/plain and text/html versions of the message body */
 			handle_multipart_alternative (composer, multipart, depth);
 		} else {
 			/* there must be attachments... */
 			handle_multipart (composer, multipart, depth);
 		}
-	} else if (camel_content_type_is (content_type, "text", "*")) {
+	} else if (header_content_type_is (content_type, "text", "*")) {
 		char *text;
 		
 		if ((text = mail_get_message_body (content, FALSE, FALSE)))
@@ -3412,11 +3412,11 @@ handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart,
 				/* depth doesn't matter so long as we don't pass 0 */
 				handle_multipart (composer, mp, depth + 1);
 			}
-		} else if (camel_content_type_is (content_type, "text", "html")) {
+		} else if (header_content_type_is (content_type, "text", "html")) {
 			/* text/html is preferable, so once we find it we're done... */
 			text_part = mime_part;
 			break;
-		} else if (camel_content_type_is (content_type, "text", "*")) {
+		} else if (header_content_type_is (content_type, "text", "*")) {
 			/* anyt text part not text/html is second rate so the first
 			   text part we find isn't necessarily the one we'll use. */
 			if (!text_part)
@@ -3463,7 +3463,7 @@ handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
 			} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
 				/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
 				handle_multipart_encrypted (composer, mp, depth + 1);
-			} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
+			} else if (header_content_type_is (content_type, "multipart", "alternative")) {
 				handle_multipart_alternative (composer, mp, depth + 1);
 			} else {
 				/* depth doesn't matter so long as we don't pass 0 */
@@ -3553,7 +3553,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	EDestination **Tov, **Ccv, **Bccv;
 	GHashTable *auto_cc, *auto_bcc;
 	CamelContentType *content_type;
-	struct _camel_header_raw *headers;
+	struct _header_raw *headers;
 	CamelDataWrapper *content;
 	EAccount *account = NULL;
 	char *account_name;
@@ -3736,7 +3736,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 		} else if (CAMEL_IS_MULTIPART_ENCRYPTED (content)) {
 			/* decrypt the encrypted content and configure the composer to encrypt outgoing messages */
 			handle_multipart_encrypted (new, multipart, 0);
-		} else if (camel_content_type_is (content_type, "multipart", "alternative")) {
+		} else if (header_content_type_is (content_type, "multipart", "alternative")) {
 			/* this contains the text/plain and text/html versions of the message body */
 			handle_multipart_alternative (new, multipart, 0);
 		} else {
@@ -4188,7 +4188,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
 	camel_object_unref (wrapper);
 	
-	cid = camel_header_msgid_generate ();
+	cid = header_msgid_generate ();
 	camel_mime_part_set_content_id (part, cid);
 	name = g_path_get_basename(file_name);
 	camel_mime_part_set_filename (part, name);