From 383f245d39b8b806a4b6ce4dea7b0ab7f1658450 Mon Sep 17 00:00:00 2001 From: NotZed Date: Thu, 20 Apr 2000 23:48:45 +0000 Subject: MERGE NEW_PARSER branch into HEAD, fixed conflicts. 2000-04-20 NotZed * MERGE NEW_PARSER branch into HEAD, fixed conflicts. * gmime-content-field.c (_print_parameter): Duh, removed again (@@#$@ cvs merge). * camel-mime-utils.c (header_content_type_is): Constify. (header_content_type_unref): Killed a couple warnings. * camel-folder.c (_init): Removed more log crap. * providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for summary changes. * providers/mbox/camel-mbox-folder.c (_get_message_by_number): Fixed for new summary interface. Added a warning for using this broken api. (_get_message_by_uid): Fixed for message new with session vanishing. svn path=/trunk/; revision=2531 --- camel/gmime-content-field.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'camel/gmime-content-field.h') diff --git a/camel/gmime-content-field.h b/camel/gmime-content-field.h index 44d0674bf5..5a28d0fedb 100644 --- a/camel/gmime-content-field.h +++ b/camel/gmime-content-field.h @@ -36,13 +36,15 @@ extern "C" { #include #include -#include "camel-stream.h" +#include +#include typedef struct { + struct _header_content_type *content_type; - gchar *type; - gchar *subtype; - GHashTable *parameters; + /* these should be deprecated (use the accessors) */ + char *type; /* these are only copies of the ones in content_type */ + char *subtype; gint ref; @@ -59,6 +61,8 @@ void gmime_content_field_free (GMimeContentField *content_field); gchar * gmime_content_field_get_mime_type (GMimeContentField *content_field); const gchar *gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar *name); +int gmime_content_field_is_type (GMimeContentField *content_field, const char *type, const char *subtype); + #ifdef __cplusplus } -- cgit v1.2.3