From a72785e2a7fa4e59e4297610ea3070ce79632d0b Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 18 Sep 2003 17:05:43 +0000 Subject: Updated for namespace changes in Camel. 2003-09-18 Jeffrey Stedfast * e-msg-composer-attachment-bar.c: * e-msg-composer-attachment.c: * e-msg-composer.c: Updated for namespace changes in Camel. svn path=/trunk/; revision=22611 --- composer/ChangeLog | 6 +++++ composer/e-msg-composer-attachment-bar.c | 12 +++++----- composer/e-msg-composer-attachment.c | 4 ++-- composer/e-msg-composer.c | 40 ++++++++++++++++---------------- 4 files changed, 34 insertions(+), 28 deletions(-) (limited to 'composer') diff --git a/composer/ChangeLog b/composer/ChangeLog index a3531effbb..bfd7f4c4a6 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2003-09-18 Jeffrey Stedfast + + * e-msg-composer-attachment-bar.c: + * e-msg-composer-attachment.c: + * e-msg-composer.c: Updated for namespace changes in Camel. + 2003-09-17 Not Zed ** Merge in mail-refactor-2-branch diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c index 7e7d9227c3..479fd99871 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 = header_content_type_is (content_type, "image", "*"); + image = camel_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 = header_content_type_simple (content_type); + mime_type = camel_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 (header_content_type_is (content_type, "text", "*")) { + if (camel_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 = header_content_type_param (content_type, "charset"); + charset = camel_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 */ - header_content_type_set_param (content_type, "charset", default_charset); - type = header_content_type_format (content_type); + camel_content_type_set_param (content_type, "charset", default_charset); + type = camel_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 1c9e19b9ea..2e8a0c61c5 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 = header_msgid_generate (); + content_id = camel_header_msgid_generate (); camel_mime_part_set_content_id (part, content_id); g_free (content_id); #endif @@ -438,7 +438,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 = header_content_type_simple (content_type); + type = camel_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 18d8eb4a1f..835a2117de 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -387,7 +387,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 = header_content_type_decode (composer->mime_type); + type = camel_content_type_decode (composer->mime_type); } else { data = get_text (composer->persist_stream_interface, "text/plain"); if (!data) { @@ -398,9 +398,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 = header_content_type_new ("text", "plain"); + type = camel_content_type_new ("text", "plain"); if (charset) - header_content_type_set_param (type, "charset", charset); + camel_content_type_set_param (type, "charset", charset); } stream = camel_stream_mem_new_with_byte_array (data); @@ -425,7 +425,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) camel_object_unref (stream); camel_data_wrapper_set_mime_type_field (plain, type); - header_content_type_unref (type); + camel_content_type_unref (type); if (composer->send_html) { CORBA_Environment ev; @@ -2538,7 +2538,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) == HSCAN_FROM) { + while (camel_mime_parser_step (mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM) { CamelMimeMessage *message; CamelMimePart *part; @@ -3241,10 +3241,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 && header_content_type_is (content_type, "image", "*")) { + } else if (related && camel_content_type_is (content_type, "image", "*")) { e_msg_composer_add_inline_image_from_mime_part (composer, mime_part); } else { - if (header_content_type_is (content_type, "text", "*")) { + if (camel_content_type_is (content_type, "text", "*")) { /* do nothing */ } else { e_msg_composer_attach (composer, mime_part); @@ -3261,7 +3261,7 @@ add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipar gboolean related; int i, nparts; - related = header_content_type_is (CAMEL_DATA_WRAPPER (multipart)->mime_type, "multipart", "related"); + related = camel_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); @@ -3333,15 +3333,15 @@ 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 (header_content_type_is (content_type, "multipart", "alternative")) { + } else if (camel_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 (header_content_type_is (content_type, "text", "*")) { - e_msg_composer_set_pending_body(composer, em_utils_part_to_html(mime_part)); + } else if (camel_content_type_is (content_type, "text", "*")) { + e_msg_composer_set_pending_body (composer, em_utils_part_to_html (mime_part)); } else { e_msg_composer_attach (composer, mime_part); } @@ -3387,15 +3387,15 @@ 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 (header_content_type_is (content_type, "multipart", "alternative")) { + } else if (camel_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 (header_content_type_is (content_type, "text", "*")) { - e_msg_composer_set_pending_body(composer, em_utils_part_to_html(mime_part)); + } else if (camel_content_type_is (content_type, "text", "*")) { + e_msg_composer_set_pending_body (composer, em_utils_part_to_html (mime_part)); } else { e_msg_composer_attach (composer, mime_part); } @@ -3436,11 +3436,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 (header_content_type_is (content_type, "text", "html")) { + } else if (camel_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 (header_content_type_is (content_type, "text", "*")) { + } else if (camel_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) @@ -3481,7 +3481,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 (header_content_type_is (content_type, "multipart", "alternative")) { + } else if (camel_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 */ @@ -3566,7 +3566,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) EDestination **Tov, **Ccv, **Bccv; GHashTable *auto_cc, *auto_bcc; CamelContentType *content_type; - struct _header_raw *headers; + struct _camel_header_raw *headers; CamelDataWrapper *content; EAccount *account = NULL; char *account_name; @@ -3749,7 +3749,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 (header_content_type_is (content_type, "multipart", "alternative")) { + } else if (camel_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 { @@ -4193,7 +4193,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 = header_msgid_generate (); + cid = camel_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); -- cgit