diff options
| -rw-r--r-- | camel/ChangeLog | 8 | ||||
| -rw-r--r-- | camel/camel-data-wrapper.c | 2 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 6 | ||||
| -rw-r--r-- | camel/camel-mime-utils.h | 1 |
4 files changed, 16 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4339e498d9..4888a385e5 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,11 @@ +2001-01-02 Dan Winship <danw@helixcode.com> + + * camel-mime-utils.c (header_content_type_simple): New function to + return just foo/bar with no parameters. + + * camel-data-wrapper.c (get_mime_type): Use + header_content_type_simple rather than header_content_type_format. + 2000-12-28 Dan Winship <danw@helixcode.com> * gmime-content-field.[ch]: Remove this. It was only a thin diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c index 061e664b92..d5a43d27ba 100644 --- a/camel/camel-data-wrapper.c +++ b/camel/camel-data-wrapper.c @@ -205,7 +205,7 @@ camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, static gchar * get_mime_type (CamelDataWrapper *data_wrapper) { - return header_content_type_format (data_wrapper->mime_type); + return header_content_type_simple (data_wrapper->mime_type); } /** diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index e2264159bc..c5616ca05c 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -2464,6 +2464,12 @@ header_content_type_format(struct _header_content_type *ct) } char * +header_content_type_simple(struct _header_content_type *ct) +{ + return g_strdup_printf("%s/%s", ct->type, ct->subtype); +} + +char * header_content_encoding_decode(const char *in) { if (in) diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h index 119eda9626..2e478066fc 100644 --- a/camel/camel-mime-utils.h +++ b/camel/camel-mime-utils.h @@ -118,6 +118,7 @@ const char *header_content_type_param(struct _header_content_type *t, const char void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value); int header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype); char *header_content_type_format(struct _header_content_type *ct); +char *header_content_type_simple(struct _header_content_type *ct); /* DEBUGGING function */ void header_content_type_dump(struct _header_content_type *ct); |