temporarily reverting my camel namespace patches until after we merge in some of the other branches

svn path=/trunk/; revision=22373

1 files changed, 94 insertions, 94 deletions

diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 7035b7696d..b58bcbea72 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 2000-2003 Ximian Inc.
+ *  Copyright (C) 2000 Ximian Inc.
  *
  *  Authors: Michael Zucchi <notzed@ximian.com>
  *           Jeffrey Stedfast <fejj@ximian.com>
@@ -32,9 +32,9 @@ extern "C" {
 #include <time.h>
 #include <glib.h>
 
-/* maximum recommended size of a line from camel_header_fold() */
+/* maximum recommended size of a line from header_fold() */
 #define CAMEL_FOLD_SIZE (77)
-/* maximum hard size of a line from camel_header_fold() */
+/* maximum hard size of a line from header_fold() */
 #define CAMEL_FOLD_MAX_SIZE (998)
 
 #define CAMEL_UUDECODE_STATE_INIT   (0)
@@ -55,53 +55,53 @@ typedef enum _CamelMimePartEncodingType {
 } CamelMimePartEncodingType;
 
 /* a list of references for this message */
-struct _camel_header_references {
-	struct _camel_header_references *next;
+struct _header_references {
+	struct _header_references *next;
 	char *id;
 };
 
-struct _camel_header_param {
-	struct _camel_header_param *next;
+struct _header_param {
+	struct _header_param *next;
 	char *name;
 	char *value;
 };
 
 /* describes a content-type */
-typedef struct {
+struct _header_content_type {
 	char *type;
 	char *subtype;
-	struct _camel_header_param *params;
+	struct _header_param *params;
 	unsigned int refcount;
-} CamelContentType;
+};
 
 /* a raw rfc822 header */
 /* the value MUST be US-ASCII */
-struct _camel_header_raw {
-	struct _camel_header_raw *next;
+struct _header_raw {
+	struct _header_raw *next;
 	char *name;
 	char *value;
 	int offset;		/* in file, if known */
 };
 
-typedef struct {
+typedef struct _CamelMimeDisposition {
 	char *disposition;
-	struct _camel_header_param *params;
+	struct _header_param *params;
 	unsigned int refcount;
-} CamelContentDisposition;
+} CamelMimeDisposition;
 
-enum _camel_header_address_t {
+enum _header_address_type {
 	HEADER_ADDRESS_NONE,	/* uninitialised */
 	HEADER_ADDRESS_NAME,
 	HEADER_ADDRESS_GROUP
 };
 
-struct _camel_header_address {
-	struct _camel_header_address *next;
-	enum _camel_header_address_t type;
+struct _header_address {
+	struct _header_address *next;
+	enum _header_address_type type;
 	char *name;
 	union {
 		char *addr;
-		struct _camel_header_address *members;
+		struct _header_address *members;
 	} v;
 	unsigned int refcount;
 };
@@ -110,116 +110,116 @@ struct _camel_header_address {
 void camel_mime_utils_init(void);
 
 /* Address lists */
-struct _camel_header_address *camel_header_address_new (void);
-struct _camel_header_address *camel_header_address_new_name (const char *name, const char *addr);
-struct _camel_header_address *camel_header_address_new_group (const char *name);
-void camel_header_address_ref (struct _camel_header_address *);
-void camel_header_address_unref (struct _camel_header_address *);
-void camel_header_address_set_name (struct _camel_header_address *, const char *name);
-void camel_header_address_set_addr (struct _camel_header_address *, const char *addr);
-void camel_header_address_set_members (struct _camel_header_address *, struct _camel_header_address *group);
-void camel_header_address_add_member (struct _camel_header_address *, struct _camel_header_address *member);
-void camel_header_address_list_append_list (struct _camel_header_address **l, struct _camel_header_address **h);
-void camel_header_address_list_append (struct _camel_header_address **, struct _camel_header_address *);
-void camel_header_address_list_clear (struct _camel_header_address **);
-
-struct _camel_header_address *camel_header_address_decode (const char *in, const char *charset);
-struct _camel_header_address *camel_header_mailbox_decode (const char *in, const char *charset);
+struct _header_address *header_address_new(void);
+struct _header_address *header_address_new_name(const char *name, const char *addr);
+struct _header_address *header_address_new_group(const char *name);
+void header_address_ref(struct _header_address *);
+void header_address_unref(struct _header_address *);
+void header_address_set_name(struct _header_address *, const char *name);
+void header_address_set_addr(struct _header_address *, const char *addr);
+void header_address_set_members(struct _header_address *, struct _header_address *group);
+void header_address_add_member(struct _header_address *, struct _header_address *member);
+void header_address_list_append_list(struct _header_address **l, struct _header_address **h);
+void header_address_list_append(struct _header_address **, struct _header_address *);
+void header_address_list_clear(struct _header_address **);
+
+struct _header_address *header_address_decode(const char *in, const char *charset);
+struct _header_address *header_mailbox_decode(const char *in, const char *charset);
 /* for mailing */
-char *camel_header_address_list_encode (struct _camel_header_address *a);
+char *header_address_list_encode(struct _header_address *a);
 /* for display */
-char *camel_header_address_list_format (struct _camel_header_address *a);
+char *header_address_list_format(struct _header_address *a);
 
 /* structured header prameters */
-struct _camel_header_param *camel_header_param_list_decode (const char *in);
-char *camel_header_param (struct _camel_header_param *p, const char *name);
-struct _camel_header_param *camel_header_set_param (struct _camel_header_param **l, const char *name, const char *value);
-void camel_header_param_list_format_append (GString *out, struct _camel_header_param *p);
-char *camel_header_param_list_format (struct _camel_header_param *p);
-void camel_header_param_list_free (struct _camel_header_param *p);
+struct _header_param *header_param_list_decode(const char *in);
+char *header_param(struct _header_param *p, const char *name);
+struct _header_param *header_set_param(struct _header_param **l, const char *name, const char *value);
+void header_param_list_format_append(GString *out, struct _header_param *p);
+char *header_param_list_format(struct _header_param *p);
+void header_param_list_free(struct _header_param *p);
 
 /* Content-Type header */
-CamelContentType *camel_content_type_new (const char *type, const char *subtype);
-CamelContentType *camel_content_type_decode (const char *in);
-void camel_content_type_unref (CamelContentType *ct);
-void camel_content_type_ref (CamelContentType *ct);
-const char *camel_content_type_param (CamelContentType *t, const char *name);
-void camel_content_type_set_param (CamelContentType *t, const char *name, const char *value);
-int camel_content_type_is (CamelContentType *ct, const char *type, const char *subtype);
-char *camel_content_type_format (CamelContentType *ct);
-char *camel_content_type_simple (CamelContentType *ct);
+struct _header_content_type *header_content_type_new(const char *type, const char *subtype);
+struct _header_content_type *header_content_type_decode(const char *in);
+void header_content_type_unref(struct _header_content_type *ct);
+void header_content_type_ref(struct _header_content_type *ct);
+const char *header_content_type_param(struct _header_content_type *t, const char *name);
+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 camel_content_type_dump (CamelContentType *ct);
+void header_content_type_dump(struct _header_content_type *ct);
 
 /* Content-Disposition header */
-CamelContentDisposition *camel_content_disposition_decode (const char *in);
-void camel_content_disposition_ref (CamelContentDisposition *);
-void camel_content_disposition_unref (CamelContentDisposition *);
-char *camel_content_disposition_format (CamelContentDisposition *d);
+CamelMimeDisposition *header_disposition_decode(const char *in);
+void header_disposition_ref(CamelMimeDisposition *);
+void header_disposition_unref(CamelMimeDisposition *);
+char *header_disposition_format(CamelMimeDisposition *d);
 
 /* decode the contents of a content-encoding header */
-char *camel_header_content_encoding_decode (const char *in);
+char *header_content_encoding_decode(const char *in);
 
 /* raw headers */
-void camel_header_raw_append (struct _camel_header_raw **list, const char *name, const char *value, int offset);
-void camel_header_raw_append_parse (struct _camel_header_raw **list, const char *header, int offset);
-const char *camel_header_raw_find (struct _camel_header_raw **list, const char *name, int *offset);
-const char *camel_header_raw_find_next (struct _camel_header_raw **list, const char *name, int *offset, const char *last);
-void camel_header_raw_replace (struct _camel_header_raw **list, const char *name, const char *value, int offset);
-void camel_header_raw_remove (struct _camel_header_raw **list, const char *name);
-void camel_header_raw_fold (struct _camel_header_raw **list);
-void camel_header_raw_clear (struct _camel_header_raw **list);
+void header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset);
+void header_raw_append_parse(struct _header_raw **list, const char *header, int offset);
+const char *header_raw_find(struct _header_raw **list, const char *name, int *offset);
+const char *header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last);
+void header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset);
+void header_raw_remove(struct _header_raw **list, const char *name);
+void header_raw_fold(struct _header_raw **list);
+void header_raw_clear(struct _header_raw **list);
 
-char *camel_header_raw_check_mailing_list (struct _camel_header_raw **list);
+char *header_raw_check_mailing_list(struct _header_raw **list);
 
 /* fold a header */
-char *camel_header_address_fold (const char *in, size_t headerlen);
-char *camel_header_fold (const char *in, size_t headerlen);
-char *camel_header_unfold (const char *in);
+char *header_address_fold (const char *in, size_t headerlen);
+char *header_fold (const char *in, size_t headerlen);
+char *header_unfold (const char *in);
 
 /* decode a header which is a simple token */
-char *camel_header_token_decode (const char *in);
+char *header_token_decode (const char *in);
 
-int camel_header_decode_int (const char **in);
+int header_decode_int (const char **in);
 
 /* decode/encode a string type, like a subject line */
-char *camel_header_decode_string (const char *in, const char *default_charset);
-char *camel_header_encode_string (const unsigned char *in);
+char *header_decode_string (const char *in, const char *default_charset);
+char *header_encode_string (const unsigned char *in);
 
 /* encode a phrase, like the real name of an address */
-char *camel_header_encode_phrase (const unsigned char *in);
+char *header_encode_phrase (const unsigned char *in);
 
 /* decode an email date field into a GMT time, + optional offset */
-time_t camel_header_decode_date (const char *in, int *saveoffset);
-char *camel_header_format_date (time_t time, int offset);
+time_t header_decode_date (const char *in, int *saveoffset);
+char *header_format_date (time_t time, int offset);
 
 /* decode a message id */
-char *camel_header_msgid_decode (const char *in);
-char *camel_header_contentid_decode (const char *in);
+char *header_msgid_decode (const char *in);
+char *header_contentid_decode (const char *in);
 
 /* generate msg id */
-char *camel_header_msgid_generate (void);
+char *header_msgid_generate (void);
 
 /* decode a References or In-Reply-To header */
-struct _camel_header_references *camel_header_references_inreplyto_decode (const char *in);
-struct _camel_header_references *camel_header_references_decode (const char *in);
-void camel_header_references_list_clear (struct _camel_header_references **list);
-void camel_header_references_list_append_asis (struct _camel_header_references **list, char *ref);
-int camel_header_references_list_size (struct _camel_header_references **list);
-struct _camel_header_references *camel_header_references_dup (const struct _camel_header_references *list);
+struct _header_references *header_references_inreplyto_decode (const char *in);
+struct _header_references *header_references_decode(const char *in);
+void header_references_list_clear(struct _header_references **list);
+void header_references_list_append_asis(struct _header_references **list, char *ref);
+int header_references_list_size(struct _header_references **list);
+struct _header_references *header_references_dup(const struct _header_references *list);
 
 /* decode content-location */
-char *camel_header_location_decode (const char *in);
+char *header_location_decode(const char *in);
 
 /* decode the mime-type header */
-void camel_header_mime_decode (const char *in, int *maj, int *min);
+void header_mime_decode(const char *in, int *maj, int *min);
 
 /* do incremental base64/quoted-printable (de/en)coding */
-size_t base64_decode_step (unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save);
+size_t base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save);
 
-size_t base64_encode_step (unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
-size_t base64_encode_close (unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
+size_t base64_encode_step(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
+size_t base64_encode_close(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
 
 size_t uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save);
 
@@ -228,10 +228,10 @@ size_t uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigne
 size_t uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,
 		       guint32 *save);
 
-size_t quoted_decode_step (unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme);
+size_t quoted_decode_step(unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme);
 
-size_t quoted_encode_step (unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
-size_t quoted_encode_close (unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
+size_t quoted_encode_step(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
+size_t quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);
 
 char *base64_encode_simple (const char *data, size_t len);
 size_t base64_decode_simple (char *data, size_t len);