aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-04-28 06:43:43 +0800
committerDan Winship <danw@src.gnome.org>2000-04-28 06:43:43 +0800
commitb0b5049774292ef6ab53f20589305c1bc7481f60 (patch)
tree67fff5fc5cb11f7ca1c518d0532b57a635ffa44d
parentf99adedeb6714ed2971d60f1e56f49871a65619c (diff)
downloadgsoc2013-evolution-b0b5049774292ef6ab53f20589305c1bc7481f60.tar.gz
gsoc2013-evolution-b0b5049774292ef6ab53f20589305c1bc7481f60.tar.zst
gsoc2013-evolution-b0b5049774292ef6ab53f20589305c1bc7481f60.zip
Revert previous change. I was confused.
* camel-mime-part.c (write_to_stream): Revert previous change. I was confused. svn path=/trunk/; revision=2666
-rw-r--r--camel/ChangeLog3
-rw-r--r--camel/camel-mime-part.c11
2 files changed, 7 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index b5ac3d1392..9adca603b9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,8 @@
2000-04-27 Dan Winship <danw@helixcode.com>
+ * camel-mime-part.c (write_to_stream): Revert previous change. I
+ was confused.
+
* camel-url.[ch] (camel_url_encode, camel_url_decode): expose
these routines.
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 30c08a485f..6e2276df90 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -504,14 +504,11 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
}
}
- content = camel_medium_get_content_object (medium);
-
- if (!CAMEL_IS_MEDIUM (content)) {
- if ( (count = camel_stream_write_string(stream,"\n")) == -1)
- return -1;
- total += count;
- }
+ if ( (count = camel_stream_write_string(stream,"\n")) == -1)
+ return -1;
+ total += count;
+ content = camel_medium_get_content_object (medium);
if (content) {
if ( (count = camel_data_wrapper_write_to_stream(content, stream)) == -1 )
return -1;