aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/camel-mime-part.c3
-rw-r--r--camel/camel-stream-b64.c6
-rw-r--r--camel/gmime-utils.c5
4 files changed, 19 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7a1e304924..e8657d6d3b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-29 bertrand <bertrand@helixcode.com>
+
+ * gmime-utils.c (_store_header_pair_from_string):
+ revert strange changes.
+
+ * camel-stream-b64.c (my_read_decode): set eos to true when we
+ have read the whole input stream.
+ (my_reset): set eos to FALSE.
+
2000-02-28 NotZed <NotZed@HelixCode.com>
* camel-mime-part.c (_parse_header_pair): Dont free this either.
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index b02bbe8713..f9fb82cdc3 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -630,7 +630,7 @@ _get_content_object (CamelMedium *medium)
break;
}
-
+ printf ("*************************** encoding : %d\n", mime_part->encoding);
camel_mime_part_construct_content_from_stream (mime_part, decoded_stream);
} else {
@@ -923,6 +923,7 @@ camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)
CamelMimePartEncodingType
camel_mime_part_encoding_from_string (const gchar *string)
{
+ printf ("*************** encoding string : _%s_\n", string);
if (strcmp (string, "7bit") == 0)
return CAMEL_MIME_PART_ENCODING_7BIT;
else if (strcmp (string, "8bit") == 0)
diff --git a/camel/camel-stream-b64.c b/camel/camel-stream-b64.c
index 40427caca2..53c708fd14 100644
--- a/camel/camel-stream-b64.c
+++ b/camel/camel-stream-b64.c
@@ -228,7 +228,6 @@ my_read (CamelStream *stream,
g_assert (stream);
-
if (stream_b64->mode == CAMEL_STREAM_B64_DECODER)
return my_read_decode (stream, buffer, n);
else
@@ -303,6 +302,9 @@ my_read_decode (CamelStream *stream,
}
+ if ((nb_read_in_input == 0) && (camel_stream_eos (input_stream)))
+ stream_b64->eos = TRUE;
+
return j;
}
@@ -542,6 +544,8 @@ my_reset (CamelStream *stream)
stream_b64->status.decode_status.keep = 0;
stream_b64->status.decode_status.state = 0;
+ stream_b64->eos = FALSE;
+
camel_stream_reset (stream_b64->input_stream);
}
diff --git a/camel/gmime-utils.c b/camel/gmime-utils.c
index d903eb8a71..01d35772ed 100644
--- a/camel/gmime-utils.c
+++ b/camel/gmime-utils.c
@@ -130,13 +130,14 @@ _store_header_pair_from_string (GArray *header_array, gchar *header_line)
if (header_line) {
+#if 0
char *p = strchr(header_line, ':');
if (p) {
header.name = g_strndup(header_line, p-header_line);
header.value = g_strdup(p+1);
g_array_append_val (header_array, header);
}
-#if 0
+#endif
dich_result = string_dichotomy ( header_line, ':',
&header_name, &header_value,
STRING_DICHOTOMY_NONE);
@@ -159,7 +160,7 @@ _store_header_pair_from_string (GArray *header_array, gchar *header_line)
header.value = header_value;
g_array_append_val (header_array, header);
}
-#endif
+
}
CAMEL_LOG_FULL_DEBUG ( "_store_header_pair_from_string:: Leaving\n");