aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-mime-parser.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2002-05-31 09:05:47 +0800
committerMichael Zucci <zucchi@src.gnome.org>2002-05-31 09:05:47 +0800
commit1c309b14c41ba3305bc72404fa290769251fda4a (patch)
tree6eb6042a5fe1d8695cd1508e2b7c1c0e98b5e0ef /camel/camel-mime-parser.c
parent29a8c80e9323ef2406c2b237a6a6058639fd4cb2 (diff)
downloadgsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar.gz
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar.bz2
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar.lz
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar.xz
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.tar.zst
gsoc2013-evolution-1c309b14c41ba3305bc72404fa290769251fda4a.zip
Added a protocol field for users to use.
2002-05-30 Not Zed <NotZed@Ximian.com> * camel-cipher-context.h: Added a protocol field for users to use. * camel-stream-filter.c (do_read): Sigh, the pre-size is READ_PAD not READ_SIZE. Big difference. (READ_PAD): Bumped upto 128 from 64, so we can fit a typical line in full. * providers/imap/camel-imap-folder.c (get_content): Changed to load multipart/signed as an opaque block into the right kind of object. * camel-multipart.h (struct _CamelMultipart): Removed the boundary field. It wans't actually used anywhere. * camel-seekable-substream.c (camel_seekable_substream_new_with_seekable_stream_and_bounds): Shortened this stupidly long name to just :new(), its the only way its ever used. Fixed all callers. * camel-multipart-signed.[ch]: new wrapper for multipart/signed types. We need to treat the entire content as a blob of data for transport purposes. This also cleans up a lot of the sign/verify handling. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): Just call camel_multipart_construct_from_parser for multipart parts, also use a multipart_signed for multipart/signed types. * camel-multipart.c (camel_multipart_construct_from_parser): New virtual function for multiparts to buld themselves. (construct_from_parser): Implement for normal multiparts. (toplevel): Got rid of a warning, it'll never be an abstract class. * camel-pgp-context.c (pgp_hash_to_id): (pgp_id_to_hash): Implement. (camel_pgp_context_init): Init the pgp protocol specifier. * camel-cipher-context.c (camel_cipher_id_to_hash): (camel_cipher_hash_to_id): Util virtual methods to handle the cipher id string. * camel-mime-filter-canon.[ch]: A new filter, end/start of line canonicalisation filter. Can escape "From " and strip trailing whitespace, and canonicalise the end of line to crlf or to lf. 2002-05-29 Not Zed <NotZed@Ximian.com> * camel-multipart.h (struct _CamelMultipart): Removed the 'parent', nothing used it, anywhere. Cleaned up some formatting slightly. svn path=/trunk/; revision=17057
Diffstat (limited to 'camel/camel-mime-parser.c')
-rw-r--r--camel/camel-mime-parser.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index f57583135d..2bfe4e5322 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1681,8 +1681,8 @@ tail_recurse:
if ( (content = header_raw_find(&h->headers, "Content-Type", NULL))
&& (ct = header_content_type_decode(content))) {
if (!strcasecmp(ct->type, "multipart")) {
- bound = header_content_type_param(ct, "boundary");
- if (bound) {
+ if (!header_content_type_is(ct, "multipart", "signed")
+ && (bound = header_content_type_param(ct, "boundary"))) {
d(printf("multipart, boundary = %s\n", bound));
h->boundarylen = strlen(bound)+2;
h->boundarylenfinal = h->boundarylen+2;
@@ -1690,11 +1690,11 @@ tail_recurse:
sprintf(h->boundary, "--%s--", bound);
type = HSCAN_MULTIPART;
} else {
- header_content_type_unref(ct);
- ct = header_content_type_decode("text/plain");
+ /*header_content_type_unref(ct);
+ ct = header_content_type_decode("text/plain");*/
/* We can't quite do this, as it will mess up all the offsets ... */
/* header_raw_replace(&h->headers, "Content-Type", "text/plain", offset);*/
- g_warning("Multipart with no boundary, treating as text/plain");
+ /*g_warning("Multipart with no boundary, treating as text/plain");*/
}
} else if (!strcasecmp(ct->type, "message")) {
if (!strcasecmp(ct->subtype, "rfc822")