aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-multipart.c
diff options
context:
space:
mode:
authorNotZed <NotZed@HelixCode.com>2000-05-20 03:58:41 +0800
committerMichael Zucci <zucchi@src.gnome.org>2000-05-20 03:58:41 +0800
commit2ce4eb74b65f3e9d07a921aad3899a7141b0000f (patch)
tree50439e412a6f12dc0b7db68274de8a8f16b74e08 /camel/camel-multipart.c
parentb5ae6150b2a72683b7311af3252230069300d9e2 (diff)
downloadgsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.gz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.bz2
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.lz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.xz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.zst
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.zip
> searchpart = strchr(namepart, '?');
2000-05-19 NotZed <NotZed@HelixCode.com> * camel-simple-data-wrapper.c (construct_from_stream): If we already have been constructed, unref our content. (write_to_stream): Check we've been constructued, and change for stream api changes. * camel-mime-parser.c: Removed exception stuff. * md5-utils.c (md5_get_digest_from_stream): repaired. * camel-mime-message.c: Remove exception from write_to_stream, and fix, and fix formatting. * providers/sendmail/camel-sendmail-transport.c (_send_internal): Fix for stream changes. * providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes for stream changes. * providers/mbox/camel-mbox-folder.c, and elsewhere, fix all stream api changes. (mbox_append_message): Use stream_close() now its back. (mbox_append_message): unref the from filter. * camel-stream-mem.c: And here. * camel-stream-fs.[ch]: Here too. * camel-stream-filter.c: Likewise. This is getting tedious. * camel-stream-buffer.c (stream_write): Fix a few little problems. (stream_close): Reimplmeent. (camel_stream_buffer_read_line): Slightly more efficient version, that also only allocates the right amount of memory for strings. * camel-seekable-substream.c: Likewise. * camel-seekable-stream.[ch]: Remove exceptions, fix formatting, changes for stream (re)fixes. set_bounds returns an error. * camel-stream.[ch]: Remove exceptions. Make flush and reset return an error code, repair all the screwed up formatting, and put back close. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): And here. * camel-mime-part.c (camel_mime_part_set_content): And this too. (write_to_stream): Fixed for stream changes. * camel.h: Fixed. * providers/vee/camel-vee-folder.c (vee_search_by_expression): Implement. Performs an intersection of the two searches. (camel_vee_folder_finalise): Unref search folders. (vee_append_message): Implement append. svn path=/trunk/; revision=3142
Diffstat (limited to 'camel/camel-multipart.c')
-rw-r--r--camel/camel-multipart.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 8155ce1229..ea1f7d356f 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -51,8 +51,7 @@ static void set_boundary (CamelMultipart *multipart,
gchar *boundary);
static const gchar * get_boundary (CamelMultipart *multipart);
static int write_to_stream (CamelDataWrapper *data_wrapper,
- CamelStream *stream,
- CamelException *ex);
+ CamelStream *stream);
static void finalize (GtkObject *object);
static CamelDataWrapperClass *parent_class = NULL;
@@ -406,12 +405,12 @@ camel_multipart_get_boundary (CamelMultipart *multipart)
/* this is MIME specific, doesn't belong here really */
static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream,
- CamelException *ex)
+write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
{
CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);
const gchar *boundary;
int total = 0;
+ int count;
GList *node;
/* get the bundary text */
@@ -426,10 +425,10 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream,
* your mail client probably doesn't support ...."
*/
if (multipart->preface) {
- total += camel_stream_write_string (stream,
- multipart->preface, ex);
- if (camel_exception_is_set (ex))
+ count = camel_stream_write_string (stream, multipart->preface);
+ if (count == -1)
return -1;
+ total += count;
}
/*
@@ -438,28 +437,30 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream,
*/
node = multipart->parts;
while (node) {
- total += camel_stream_printf (stream, ex, "\n--%s\n",
- boundary);
- if (camel_exception_is_set (ex))
+ count = camel_stream_printf (stream, "\n--%s\n", boundary);
+ if (count == -1)
return -1;
+ total += count;
- total += camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (node->data), stream, ex);
- if (camel_exception_is_set (ex))
+ count = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (node->data), stream);
+ if (count == -1)
return -1;
+ total += count;
node = node->next;
}
/* write the terminating boudary delimiter */
- total += camel_stream_printf (stream, ex, "\n--%s--\n", boundary);
- if (camel_exception_is_set (ex))
+ count = camel_stream_printf (stream, "\n--%s--\n", boundary);
+ if (count == -1)
return -1;
+ total += count;
/* and finally the postface */
if (multipart->postface) {
- total += camel_stream_write_string (stream,
- multipart->postface, ex);
- if (camel_exception_is_set (ex))
+ count = camel_stream_write_string (stream, multipart->postface);
+ if (count == -1)
return -1;
+ total += count;
}
return total;