aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog2
-rw-r--r--camel/camel-mime-part.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 90672ffc62..f074a045cf 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -5,6 +5,8 @@
(write_to_stream): If we have a charset on a text type that
isn't us-ascii or utf-8, then we need to reencode it, so add a
filter to do that too.
+ (write_to_stream): Fix some warnings/use the right constructor,
+ oops.
* camel-mime-utils.c (append_latin1): New function - even though
its broken, we'll assume mailers send latin1 headers instead of
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index ae33f5c8ce..20e26e110e 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -37,6 +37,7 @@
#include "camel-stream-filter.h"
#include "camel-mime-filter-basic.h"
#include "camel-mime-filter-crlf.h"
+#include "camel-mime-filter-charset.h"
#include "camel-exception.h"
#define d(x)
@@ -520,7 +521,7 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
if (gmime_content_field_is_type(mp->content_type, "text", "*")) {
CamelMimeFilter *crlf = camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_ENCODE,
CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
- char *charset;
+ const char *charset;
camel_stream_filter_add(filter_stream, crlf);
camel_object_unref((CamelObject *)crlf);
@@ -528,7 +529,7 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
charset = gmime_content_field_get_parameter(mp->content_type, "charset");
if (!(charset == NULL || !strcasecmp(charset, "us-ascii") || !strcasecmp(charset, "utf-8"))) {
CamelMimeFilter *charenc;
- charenc = camel_mime_filter_charset_new("utf-8", charset);
+ charenc = (CamelMimeFilter *)camel_mime_filter_charset_new_convert("utf-8", charset);
camel_stream_filter_add(filter_stream, charenc);
/* well some idiot changed the _add function to do its own ref'ing for
no decent purpose whatsoever ... */