diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-08-27 02:16:51 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-08-27 02:16:51 +0800 |
| commit | 04b9ec51d45f2efb3b8118eef99c7592ba269792 (patch) | |
| tree | 2ed61b2ef50a2f74fcc4911b1145367514d721e7 /camel/camel-data-wrapper.c | |
| parent | 173fc4ff4c7f267cefeeeed0a7a93a7f1f245c62 (diff) | |
| download | gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.gz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.bz2 gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.lz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.xz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.zst gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.zip | |
temporarily reverting my camel namespace patches until after we merge in some of the other branches
svn path=/trunk/; revision=22373
Diffstat (limited to 'camel/camel-data-wrapper.c')
| -rw-r--r-- | camel/camel-data-wrapper.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c index 9cacbaf5e3..7230f77d6d 100644 --- a/camel/camel-data-wrapper.c +++ b/camel/camel-data-wrapper.c @@ -75,7 +75,7 @@ camel_data_wrapper_init (gpointer object, gpointer klass) camel_data_wrapper->priv = g_malloc (sizeof (struct _CamelDataWrapperPrivate)); pthread_mutex_init (&camel_data_wrapper->priv->stream_lock, NULL); - camel_data_wrapper->mime_type = camel_content_type_new ("application", "octet-stream"); + camel_data_wrapper->mime_type = header_content_type_new ("application", "octet-stream"); camel_data_wrapper->encoding = CAMEL_MIME_PART_ENCODING_DEFAULT; camel_data_wrapper->offline = FALSE; } @@ -90,7 +90,7 @@ camel_data_wrapper_finalize (CamelObject *object) g_free (camel_data_wrapper->priv); if (camel_data_wrapper->mime_type) - camel_content_type_unref (camel_data_wrapper->mime_type); + header_content_type_unref (camel_data_wrapper->mime_type); if (camel_data_wrapper->stream) camel_object_unref (camel_data_wrapper->stream); @@ -198,7 +198,7 @@ decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) break; } - if (camel_content_type_is (data_wrapper->mime_type, "text", "*")) { + if (header_content_type_is (data_wrapper->mime_type, "text", "*")) { filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY); camel_stream_filter_add (CAMEL_STREAM_FILTER (fstream), filter); @@ -270,8 +270,8 @@ static void set_mime_type (CamelDataWrapper *data_wrapper, const char *mime_type) { if (data_wrapper->mime_type) - camel_content_type_unref (data_wrapper->mime_type); - data_wrapper->mime_type = camel_content_type_decode (mime_type); + header_content_type_unref (data_wrapper->mime_type); + data_wrapper->mime_type = header_content_type_decode (mime_type); } /** @@ -299,7 +299,7 @@ camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, static char * get_mime_type (CamelDataWrapper *data_wrapper) { - return camel_content_type_simple (data_wrapper->mime_type); + return header_content_type_simple (data_wrapper->mime_type); } /** @@ -354,10 +354,10 @@ set_mime_type_field (CamelDataWrapper *data_wrapper, g_return_if_fail (mime_type != NULL); if (data_wrapper->mime_type) - camel_content_type_unref (data_wrapper->mime_type); + header_content_type_unref (data_wrapper->mime_type); data_wrapper->mime_type = mime_type; if (mime_type) - camel_content_type_ref (data_wrapper->mime_type); + header_content_type_ref (data_wrapper->mime_type); } void |