diff options
| author | NotZed <notzed@zedzone.helixcode.com> | 2000-02-10 10:15:02 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-02-10 10:15:02 +0800 |
| commit | 8e008e868d747a7dfc5d6be37dc01a2209632f83 (patch) | |
| tree | d156ff0aee34aeec8d2f722a61e3a887c44b34de /camel/camel-mime-part.c | |
| parent | 504b7541a21b33307d970bfde272b2329fa828a0 (diff) | |
| download | gsoc2013-evolution-8e008e868d747a7dfc5d6be37dc01a2209632f83.tar.gz gsoc2013-evolution-8e008e868d747a7dfc5d6be37dc01a2209632f83.tar.zst gsoc2013-evolution-8e008e868d747a7dfc5d6be37dc01a2209632f83.zip | |
If we get a -1 read, DONT update the total bytes, and try and truncate the
2000-02-09 NotZed <notzed@zedzone.helixcode.com>
* camel/camel-mime-part-utils.c
(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
DONT update the total bytes, and try and truncate the array in
reverse. Eek.
* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
This was DEFINETLEY not the right way to do it. strncmp!=strcmp
(camel_mime_part_encoding_to_string): Handle the default case.
: include string.h for strcmp() etc.
svn path=/trunk/; revision=1720
Diffstat (limited to 'camel/camel-mime-part.c')
| -rw-r--r-- | camel/camel-mime-part.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c index 874400deb8..84140f5aa7 100644 --- a/camel/camel-mime-part.c +++ b/camel/camel-mime-part.c @@ -25,6 +25,7 @@ * USA */ #include <config.h> +#include <string.h> #include "camel-mime-part.h" #include <stdio.h> #include "gmime-content-field.h" @@ -591,6 +592,7 @@ _get_content_object (CamelMedium *medium) * Beware : this will destroy the temp buffer as well */ gtk_object_unref (GTK_OBJECT (stream)); + mime_part->temp_message_buffer = 0; } else { CAMEL_LOG_FULL_DEBUG ("CamelMimePart::get_content_object part has a pointer " "to a content object as well as a temp buffer\n"); @@ -803,6 +805,7 @@ camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding) case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE: return "quoted-printable"; } + return ""; } @@ -810,13 +813,13 @@ camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding) CamelMimePartEncodingType camel_mime_part_encoding_from_string (const gchar *string) { - if (strncmp (string, "7bit") == 0) + if (strcmp (string, "7bit") == 0) return CAMEL_MIME_PART_ENCODING_7BIT; - else if (strncmp (string, "8bit") == 0) + else if (strcmp (string, "8bit") == 0) return CAMEL_MIME_PART_ENCODING_8BIT; - else if (strncmp (string, "base64") == 0) + else if (strcmp (string, "base64") == 0) return CAMEL_MIME_PART_ENCODING_BASE64; - else if (strncmp (string, "quoted-printable") == 0) + else if (strcmp (string, "quoted-printable") == 0) return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE; else /* FIXME? Spit a warning? */ |