aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-12-29 03:29:09 +0800
committerDan Winship <danw@src.gnome.org>2000-12-29 03:29:09 +0800
commit87d3886d23295d8dc8ce02a717696af927d8833a (patch)
tree4fcdc6cbf374cb4536578b1cb5add8814d20e065 /composer/e-msg-composer.c
parent22876b6aa8f2e00c61e70352336ad00250dcec33 (diff)
downloadgsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar.gz
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar.bz2
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar.lz
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar.xz
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.tar.zst
gsoc2013-evolution-87d3886d23295d8dc8ce02a717696af927d8833a.zip
Use CamelContentType instead of GMimeContentField.
* e-msg-composer.c (handle_multipart_alternative, handle_multipart, e_msg_composer_new_with_message): Use CamelContentType instead of GMimeContentField. * e-msg-composer-attachment.c (e_msg_composer_attachment_edit): * e-msg-composer-attachment-bar.c (update, attach_to_multipart): Use CamelContentType, and use the header_content_type_* functions rather than operating on the structure by hand. svn path=/trunk/; revision=7188
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 44994540cb..a494fce920 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1483,13 +1483,13 @@ handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart)
nparts = camel_multipart_get_number (multipart);
for (i = 0; i < nparts; i++) {
- GMimeContentField *content_type;
+ CamelContentType *content_type;
CamelMimePart *mime_part;
mime_part = camel_multipart_get_part (multipart, i);
content_type = camel_mime_part_get_content_type (mime_part);
- if (gmime_content_field_is_type (content_type, "text", "html")) {
+ if (header_content_type_is (content_type, "text", "html")) {
CamelDataWrapper *contents;
char *text, *final_text;
gboolean is_html;
@@ -1520,13 +1520,13 @@ handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
nparts = camel_multipart_get_number (multipart);
for (i = 0; i < nparts; i++) {
- GMimeContentField *content_type;
+ CamelContentType *content_type;
CamelMimePart *mime_part;
mime_part = camel_multipart_get_part (multipart, i);
content_type = camel_mime_part_get_content_type (mime_part);
- if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {
+ if (header_content_type_is (content_type, "multipart", "alternative")) {
/* this structure contains the body */
CamelDataWrapper *wrapper;
CamelMultipart *mpart;
@@ -1535,7 +1535,7 @@ handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)
mpart = CAMEL_MULTIPART (wrapper);
handle_multipart_alternative (composer, mpart);
- } else if (gmime_content_field_is_type (content_type, "multipart", "*")) {
+ } else if (header_content_type_is (content_type, "multipart", "*")) {
/* another layer of multipartness... */
CamelDataWrapper *wrapper;
CamelMultipart *mpart;
@@ -1581,7 +1581,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
{
const CamelInternetAddress *to, *cc, *bcc;
GList *To = NULL, *Cc = NULL, *Bcc = NULL;
- GMimeContentField *content_type;
+ CamelContentType *content_type;
const gchar *subject;
EMsgComposer *new;
guint len, i;
@@ -1647,7 +1647,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
free_recipients (Bcc);
content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (msg));
- if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {
+ if (header_content_type_is (content_type, "multipart", "alternative")) {
/* multipart/alternative contains the text/plain and text/html versions of the message body */
CamelDataWrapper *wrapper;
CamelMultipart *multipart;
@@ -1656,7 +1656,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
multipart = CAMEL_MULTIPART (wrapper);
handle_multipart_alternative (new, multipart);
- } else if (gmime_content_field_is_type (content_type, "multipart", "*")) {
+ } else if (header_content_type_is (content_type, "multipart", "*")) {
/* there must be attachments... */
CamelDataWrapper *wrapper;
CamelMultipart *multipart;