aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-11 01:30:50 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-11 01:30:50 +0800
commit8cb514d6dd9497893a35a089d07a132d51263ee7 (patch)
tree9f4e5d1f929da7e0be900919753d419fe4c9c61a /composer/e-msg-composer.c
parentbcbb63c59f80eb4e684036c5ef58ab141fb01b03 (diff)
downloadgsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.gz
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.zst
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.zip
Merge with camel-async.
svn path=/trunk/; revision=4687
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 0c195a8327..ac22995e28 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -248,13 +248,13 @@ build_message (EMsgComposer *composer)
camel_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");
g_free (fmt);
camel_multipart_add_part (body, part);
- gtk_object_unref (GTK_OBJECT (part));
+ camel_object_unref (CAMEL_OBJECT (part));
part = camel_mime_part_new ();
camel_mime_part_set_content (part, html, strlen (html), "text/html");
g_free (html);
camel_multipart_add_part (body, part);
- gtk_object_unref (GTK_OBJECT (part));
+ camel_object_unref (CAMEL_OBJECT (part));
}
if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {
@@ -268,7 +268,7 @@ build_message (EMsgComposer *composer)
case MSG_FORMAT_ALTERNATIVE:
camel_medium_set_content_object (CAMEL_MEDIUM (part),
CAMEL_DATA_WRAPPER (body));
- gtk_object_unref (GTK_OBJECT (body));
+ camel_object_unref (CAMEL_OBJECT (body));
break;
case MSG_FORMAT_PLAIN:
camel_mime_part_set_content (part, fmt, strlen (fmt), "text/plain");
@@ -276,30 +276,30 @@ build_message (EMsgComposer *composer)
break;
}
camel_multipart_add_part (multipart, part);
- gtk_object_unref (GTK_OBJECT (part));
+ camel_object_unref (CAMEL_OBJECT (part));
e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);
camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (multipart));
- gtk_object_unref (GTK_OBJECT (multipart));
+ camel_object_unref (CAMEL_OBJECT (multipart));
} else {
CamelDataWrapper *cdw;
CamelStream *stream;
switch (type) {
case MSG_FORMAT_ALTERNATIVE:
camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (body));
- gtk_object_unref (GTK_OBJECT (body));
+ camel_object_unref (CAMEL_OBJECT (body));
break;
case MSG_FORMAT_PLAIN:
stream = camel_stream_mem_new_with_buffer (fmt, strlen (fmt));
cdw = camel_data_wrapper_new ();
camel_data_wrapper_construct_from_stream (cdw, stream);
- gtk_object_unref (GTK_OBJECT (stream));
+ camel_object_unref (CAMEL_OBJECT (stream));
camel_data_wrapper_set_mime_type (cdw, "text/plain");
camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (cdw));
- gtk_object_unref (GTK_OBJECT (cdw));
+ camel_object_unref (CAMEL_OBJECT (cdw));
g_free (fmt);
break;