From e74d9ca1cc1bd40982341aa85600fbc0b4f31824 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 25 Aug 2003 21:01:55 +0000 Subject: Namespaced. 2003-08-25 Jeffrey Stedfast * camel-mime-utils.[c,h]: Namespaced. * camel-data-wrapper.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-digest-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-filter-driver.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-filter-search.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-folder-search.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-folder-summary.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-http-stream.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-http-stream.h: updated for namespace changed made to camel-mime-utils.[c,h] * camel-internet-address.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-medium.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-message.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-parser.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-part-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-mime-part.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-movemail.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart-encrypted.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart-signed.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-multipart.c: updated for namespace changed made to camel-mime-utils.[c,h] * camel-search-private.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * camel-types.h: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-store-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imap/camel-imap-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/imapp/camel-imapp-utils.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-local-summary.[c,h]: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-maildir-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-mbox-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/local/camel-spool-summary.h: updated for namespace changed made to camel-mime-utils.[c,h] * providers/nntp/camel-nntp-summary.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/nntp/camel-nntp-utils.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/pop3/camel-pop3-folder.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/sendmail/camel-sendmail-transport.c: updated for namespace changed made to camel-mime-utils.[c,h] * providers/smtp/camel-smtp-transport.c: updated for namespace changed made to camel-mime-utils.[c,h] svn path=/trunk/; revision=22355 --- camel/providers/imap/camel-imap-folder.c | 10 ++-- camel/providers/imap/camel-imap-store-summary.c | 1 + camel/providers/imap/camel-imap-utils.c | 14 ++--- camel/providers/imapp/camel-imapp-utils.c | 64 +++++++++++----------- camel/providers/imapp/camel-imapp-utils.h | 6 +- camel/providers/local/camel-local-summary.c | 30 +++++----- camel/providers/local/camel-local-summary.h | 2 +- camel/providers/local/camel-maildir-summary.c | 4 +- camel/providers/local/camel-mbox-summary.c | 12 ++-- camel/providers/local/camel-spool-summary.h | 2 +- camel/providers/nntp/camel-nntp-summary.c | 19 ++++--- camel/providers/nntp/camel-nntp-utils.c | 9 ++- camel/providers/pop3/camel-pop3-folder.c | 2 +- .../providers/sendmail/camel-sendmail-transport.c | 6 +- camel/providers/smtp/camel-smtp-transport.c | 6 +- 15 files changed, 95 insertions(+), 92 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index be3e29f16b..4db0c7a43f 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -1673,7 +1673,7 @@ content_info_get_part_spec (CamelMessageContentInfo *ci) CamelMessageContentInfo *child; /* FIXME: is this only supposed to apply if 'node' is a multipart? */ - if (node->parent->parent && header_content_type_is (node->parent->type, "message", "*")) { + if (node->parent->parent && camel_content_type_is (node->parent->type, "message", "*")) { node = node->parent; continue; } @@ -1721,7 +1721,7 @@ get_content (CamelImapFolder *imap_folder, const char *uid, part_spec = content_info_get_part_spec (ci); /* There are three cases: multipart/signed, multipart, message/rfc822, and "other" */ - if (header_content_type_is (ci->type, "multipart", "signed")) { + if (camel_content_type_is (ci->type, "multipart", "signed")) { CamelMultipartSigned *body_mp; char *spec; int ret; @@ -1749,12 +1749,12 @@ get_content (CamelImapFolder *imap_folder, const char *uid, } return (CamelDataWrapper *) body_mp; - } else if (header_content_type_is (ci->type, "multipart", "*")) { + } else if (camel_content_type_is (ci->type, "multipart", "*")) { CamelMultipart *body_mp; char *child_spec; int speclen, num; - if (header_content_type_is (ci->type, "multipart", "encrypted")) + if (camel_content_type_is (ci->type, "multipart", "encrypted")) body_mp = (CamelMultipart *) camel_multipart_encrypted_new (); else body_mp = camel_multipart_new (); @@ -1808,7 +1808,7 @@ get_content (CamelImapFolder *imap_folder, const char *uid, g_free (child_spec); return (CamelDataWrapper *) body_mp; - } else if (header_content_type_is (ci->type, "message", "rfc822")) { + } else if (camel_content_type_is (ci->type, "message", "rfc822")) { content = (CamelDataWrapper *) get_message (imap_folder, uid, part_spec, ci->childs, ex); g_free (part_spec); return content; diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c index d08fd9b66d..32530d3c3f 100644 --- a/camel/providers/imap/camel-imap-store-summary.c +++ b/camel/providers/imap/camel-imap-store-summary.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2002 Ximian Inc. * diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c index 26a085739f..00115203f5 100644 --- a/camel/providers/imap/camel-imap-utils.c +++ b/camel/providers/imap/camel-imap-utils.c @@ -751,7 +751,7 @@ parse_params (const char **parms_p, CamelContentType *type) value = imap_parse_nstring (&parms, &len); if (name && value) - header_content_type_set_param (type, name, value); + camel_content_type_set_param (type, name, value); g_free (name); g_free (value); @@ -814,11 +814,11 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol inptr += 3; } - ctype = header_content_type_new ("multipart", subtype ? subtype : "mixed"); + ctype = camel_content_type_new ("multipart", subtype ? subtype : "mixed"); g_free (subtype); if (*inptr++ != ')') { - header_content_type_unref (ctype); + camel_content_type_unref (ctype); return NULL; } @@ -855,7 +855,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol camel_strdown (type); camel_strdown (subtype); - ctype = header_content_type_new (type, subtype); + ctype = camel_content_type_new (type, subtype); g_free (subtype); g_free (type); @@ -906,7 +906,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol size = strtoul ((const char *) inptr, &p, 10); inptr = (const unsigned char *) p; - if (header_content_type_is (ctype, "message", "rfc822")) { + if (camel_content_type_is (ctype, "message", "rfc822")) { /* body_type_msg */ if (*inptr++ != ' ') goto exception; @@ -928,7 +928,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol /* lines */ strtoul ((const char *) inptr, &p, 10); inptr = (const unsigned char *) p; - } else if (header_content_type_is (ctype, "text", "*")) { + } else if (camel_content_type_is (ctype, "text", "*")) { if (*inptr++ != ' ') goto exception; @@ -956,7 +956,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol exception: - header_content_type_unref (ctype); + camel_content_type_unref (ctype); g_free (id); g_free (description); g_free (encoding); diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c index 57935a81e8..dcbc362554 100644 --- a/camel/providers/imapp/camel-imapp-utils.c +++ b/camel/providers/imapp/camel-imapp-utils.c @@ -318,7 +318,7 @@ media_text ::= <"> "TEXT" <"> SPACE media_subtype /* struct _body_fields { - struct _header_content_type *ct; + CamelContentType *ct; char *msgid, *desc; CamelMimePartEncodingType encoding; guint32 size; @@ -337,7 +337,7 @@ imap_free_body(struct _CamelMessageContentInfo *cinfo) } if (cinfo->type) - header_content_type_unref(cinfo->type); + camel_content_type_unref(cinfo->type); g_free(cinfo->id); g_free(cinfo->description); g_free(cinfo->encoding); @@ -345,7 +345,7 @@ imap_free_body(struct _CamelMessageContentInfo *cinfo) } void -imap_parse_param_list(CamelIMAPPStream *is, struct _header_param **plist) +imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist) { int tok, len; unsigned char *token, *param; @@ -365,17 +365,17 @@ imap_parse_param_list(CamelIMAPPStream *is, struct _header_param **plist) param = alloca(strlen(token)+1); strcpy(param, token); camel_imapp_stream_astring(is, &token); - header_set_param(plist, param, token); + camel_header_set_param(plist, param, token); } } /* else check nil? no need */ } -struct _CamelMimeDisposition * +struct _CamelContentDisposition * imap_parse_ext_optional(CamelIMAPPStream *is) { int tok, len; unsigned char *token; - struct _CamelMimeDisposition * volatile dinfo = NULL; + struct _CamelContentDisposition * volatile dinfo = NULL; /* this parses both extension types, from the body_fld_dsp onwards */ /* although the grammars are different, they can be parsed the same way */ @@ -448,7 +448,7 @@ imap_parse_ext_optional(CamelIMAPPStream *is) } } CAMEL_CATCH(ex) { if (dinfo) - header_disposition_unref(dinfo); + camel_content_disposition_unref(dinfo); camel_exception_throw_ex(ex); } CAMEL_DONE; @@ -475,7 +475,7 @@ imap_parse_body_fields(CamelIMAPPStream *is) type = alloca(strlen(token)+1); strcpy(type, token); camel_imapp_stream_astring(is, &token); - cinfo->type = header_content_type_new(type, token); + cinfo->type = camel_content_type_new(type, token); imap_parse_param_list(is, &cinfo->type->params); /* body_fld_id ::= nstring */ @@ -501,13 +501,13 @@ imap_parse_body_fields(CamelIMAPPStream *is) return cinfo; } -struct _header_address * +struct _camel_header_address * imap_parse_address_list(CamelIMAPPStream *is) /* throws PARSE,IO exception */ { int tok, len; unsigned char *token, *host, *mbox; - struct _header_address *list = NULL; + struct _camel_header_address *list = NULL; /* "(" 1*address ")" / nil */ @@ -515,7 +515,7 @@ imap_parse_address_list(CamelIMAPPStream *is) tok = camel_imapp_stream_token(is, &token, &len); if (tok == '(') { while (1) { - struct _header_address *addr, *group = NULL; + struct _camel_header_address *addr, *group = NULL; /* address ::= "(" addr_name SPACE addr_adl SPACE addr_mailbox SPACE addr_host ")" */ @@ -525,7 +525,7 @@ imap_parse_address_list(CamelIMAPPStream *is) if (tok != '(') camel_exception_throw(1, "missing '(' for address"); - addr = header_address_new(); + addr = camel_header_address_new(); addr->type = HEADER_ADDRESS_NAME; tok = camel_imapp_stream_nstring(is, &token); addr->name = g_strdup(token); @@ -551,7 +551,7 @@ imap_parse_address_list(CamelIMAPPStream *is) g_free(addr->name); addr->name = mbox; addr->type = HEADER_ADDRESS_GROUP; - header_address_list_append(&list, addr); + camel_header_address_list_append(&list, addr); group = addr; } } else { @@ -559,9 +559,9 @@ imap_parse_address_list(CamelIMAPPStream *is) g_free(mbox); d(printf("adding address '%s'\n", addr->v.addr)); if (group != NULL) - header_address_add_member(group, addr); + camel_header_address_add_member(group, addr); else - header_address_list_append(&list, addr); + camel_header_address_list_append(&list, addr); } do { tok = camel_imapp_stream_token(is, &token, &len); @@ -571,7 +571,7 @@ imap_parse_address_list(CamelIMAPPStream *is) d(printf("empty, nil '%s'\n", token)); } } CAMEL_CATCH(ex) { - header_address_list_clear(&list); + camel_header_address_list_clear(&list); camel_exception_throw_ex(ex); } CAMEL_DONE; @@ -583,7 +583,7 @@ imap_parse_envelope(CamelIMAPPStream *is) { int tok, len; unsigned char *token; - struct _header_address *addr, *addr_from; + struct _camel_header_address *addr, *addr_from; char *addrstr; struct _CamelMessageInfo *minfo; @@ -603,7 +603,7 @@ imap_parse_envelope(CamelIMAPPStream *is) /* env_date ::= nstring */ camel_imapp_stream_nstring(is, &token); - minfo->date_sent = header_decode_date(token, NULL); + minfo->date_sent = camel_header_decode_date(token, NULL); /* env_subject ::= nstring */ tok = camel_imapp_stream_nstring(is, &token); @@ -618,10 +618,10 @@ imap_parse_envelope(CamelIMAPPStream *is) /* env_sender ::= "(" 1*address ")" / nil */ addr = imap_parse_address_list(is); if (addr_from) { - header_address_list_clear(&addr); + camel_header_address_list_clear(&addr); #if 0 if (addr) - header_address_list_append_list(&addr_from, &addr); + camel_header_address_list_append_list(&addr_from, &addr); #endif } else { if (addr) @@ -629,38 +629,38 @@ imap_parse_envelope(CamelIMAPPStream *is) } if (addr_from) { - addrstr = header_address_list_format(addr_from); + addrstr = camel_header_address_list_format(addr_from); camel_message_info_set_from(minfo, addrstr); - header_address_list_clear(&addr_from); + camel_header_address_list_clear(&addr_from); } /* we dont keep reply_to */ /* env_reply_to ::= "(" 1*address ")" / nil */ addr = imap_parse_address_list(is); - header_address_list_clear(&addr); + camel_header_address_list_clear(&addr); /* env_to ::= "(" 1*address ")" / nil */ addr = imap_parse_address_list(is); if (addr) { - addrstr = header_address_list_format(addr); + addrstr = camel_header_address_list_format(addr); camel_message_info_set_to(minfo, addrstr); - header_address_list_clear(&addr); + camel_header_address_list_clear(&addr); } /* env_cc ::= "(" 1*address ")" / nil */ addr = imap_parse_address_list(is); if (addr) { - addrstr = header_address_list_format(addr); + addrstr = camel_header_address_list_format(addr); camel_message_info_set_cc(minfo, addrstr); - header_address_list_clear(&addr); + camel_header_address_list_clear(&addr); } /* we dont keep bcc either */ /* env_bcc ::= "(" 1*address ")" / nil */ addr = imap_parse_address_list(is); - header_address_list_clear(&addr); + camel_header_address_list_clear(&addr); /* FIXME: need to put in-reply-to into references hash list */ @@ -690,7 +690,7 @@ imap_parse_body(CamelIMAPPStream *is) unsigned char *token; struct _CamelMessageContentInfo * volatile cinfo = NULL; struct _CamelMessageContentInfo *subinfo, *last; - struct _CamelMimeDisposition * volatile dinfo = NULL; + struct _CamelContentDisposition * volatile dinfo = NULL; struct _CamelMessageInfo * volatile minfo = NULL; /* body ::= "(" body_type_1part / body_type_mpart ")" */ @@ -723,7 +723,7 @@ imap_parse_body(CamelIMAPPStream *is) d(printf("media_subtype\n")); camel_imapp_stream_astring(is, &token); - cinfo->type = header_content_type_new("multipart", token); + cinfo->type = camel_content_type_new("multipart", token); /* body_ext_mpart ::= body_fld_param [SPACE body_fld_dsp SPACE body_fld_lang @@ -822,7 +822,7 @@ imap_parse_body(CamelIMAPPStream *is) if (cinfo) imap_free_body(cinfo); if (dinfo) - header_disposition_unref(dinfo); + camel_content_disposition_unref(dinfo); if (minfo) camel_message_info_free(minfo); camel_exception_throw_ex(ex); @@ -830,7 +830,7 @@ imap_parse_body(CamelIMAPPStream *is) /* FIXME: do something with the disposition, currently we have no way to pass it out? */ if (dinfo) - header_disposition_unref(dinfo); + camel_content_disposition_unref(dinfo); return cinfo; } diff --git a/camel/providers/imapp/camel-imapp-utils.h b/camel/providers/imapp/camel-imapp-utils.h index 76ec178b63..e0974bdc96 100644 --- a/camel/providers/imapp/camel-imapp-utils.h +++ b/camel/providers/imapp/camel-imapp-utils.h @@ -48,10 +48,10 @@ void imap_parse_flags(CamelIMAPPStream *stream, guint32 *flagsp) /* IO,PARSE */; void imap_write_flags(CamelStream *stream, guint32 flags) /* IO */; /* ********************************************************************** */ -void imap_parse_param_list(CamelIMAPPStream *is, struct _header_param **plist) /* IO,PARSE */; -struct _CamelMimeDisposition *imap_parse_ext_optional(CamelIMAPPStream *is) /* IO,PARSE */; +void imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist) /* IO,PARSE */; +struct _CamelContentDisposition *imap_parse_ext_optional(CamelIMAPPStream *is) /* IO,PARSE */; struct _CamelMessageContentInfo *imap_parse_body_fields(CamelIMAPPStream *is) /* IO,PARSE */; -struct _header_address *imap_parse_address_list(CamelIMAPPStream *is) /* IO,PARSE */; +struct _camel_header_address *imap_parse_address_list(CamelIMAPPStream *is) /* IO,PARSE */; struct _CamelMessageInfo *imap_parse_envelope(CamelIMAPPStream *is) /* IO, PARSE */; struct _CamelMessageContentInfo *imap_parse_body(CamelIMAPPStream *is) /* IO,PARSE */; char *imap_parse_section(CamelIMAPPStream *is) /* IO,PARSE */; diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c index 807b04e4b0..42534b361d 100644 --- a/camel/providers/local/camel-local-summary.c +++ b/camel/providers/local/camel-local-summary.c @@ -41,7 +41,7 @@ #define CAMEL_LOCAL_SUMMARY_VERSION (0x200) -static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *); +static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *); static int local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi); static char *local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi); @@ -192,8 +192,8 @@ do_stat_ci(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageContentI if (ci->encoding) info->citotal += strlen(ci->encoding) + 4; if (ci->type) { - struct _header_content_type *ct = ci->type; - struct _header_param *param; + CamelContentType *ct = ci->type; + struct _camel_header_param *param; info->citotal += sizeof(*ct) + 4; if (ct->type) @@ -308,7 +308,7 @@ camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const Cam * Return value: -1 on error, otherwise the number of bytes written. **/ int -camel_local_summary_write_headers(int fd, struct _header_raw *header, const char *xevline, const char *status, const char *xstatus) +camel_local_summary_write_headers(int fd, struct _camel_header_raw *header, const char *xevline, const char *status, const char *xstatus) { int outlen = 0, len; int newfd; @@ -463,7 +463,7 @@ static char * local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi) { GString *out = g_string_new(""); - struct _header_param *params = NULL; + struct _camel_header_param *params = NULL; GString *val = g_string_new(""); CamelFlag *flag = mi->user_flags; CamelTag *tag = mi->user_tags; @@ -492,7 +492,7 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo g_string_append_c (val, ','); flag = flag->next; } - header_set_param (¶ms, "flags", val->str); + camel_header_set_param (¶ms, "flags", val->str); g_string_truncate (val, 0); } if (tag) { @@ -504,11 +504,11 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo g_string_append_c (val, ','); tag = tag->next; } - header_set_param (¶ms, "tags", val->str); + camel_header_set_param (¶ms, "tags", val->str); } g_string_free (val, TRUE); - header_param_list_format_append (out, params); - header_param_list_free (params); + camel_header_param_list_format_append (out, params); + camel_header_param_list_free (params); } ret = out->str; g_string_free (out, FALSE); @@ -519,13 +519,13 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo static int local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi) { - struct _header_param *params, *scan; + struct _camel_header_param *params, *scan; guint32 uid, flags; char *header; int i; /* check for uid/flags */ - header = header_token_decode(xev); + header = camel_header_token_decode(xev); if (header && strlen(header) == strlen("00000000-0000") && sscanf(header, "%08x-%04x", &uid, &flags) == 2) { char uidstr[20]; @@ -546,7 +546,7 @@ local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelM /* check for additional data */ header = strchr(xev, ';'); if (header) { - params = header_param_list_decode(header+1); + params = camel_header_param_list_decode(header+1); scan = params; while (scan) { if (!strcasecmp(scan->name, "flags")) { @@ -572,13 +572,13 @@ local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelM } scan = scan->next; } - header_param_list_free(params); + camel_header_param_list_free(params); } return 0; } static CamelMessageInfo * -message_info_new(CamelFolderSummary *s, struct _header_raw *h) +message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h) { CamelMessageInfo *mi; CamelLocalSummary *cls = (CamelLocalSummary *)s; @@ -588,7 +588,7 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) const char *xev; int doindex = FALSE; - xev = header_raw_find(&h, "X-Evolution", NULL); + xev = camel_header_raw_find(&h, "X-Evolution", NULL); if (xev==NULL || camel_local_summary_decode_x_evolution(cls, xev, mi) == -1) { /* to indicate it has no xev header */ mi->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV; diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h index 0995331ab1..25d77e62c3 100644 --- a/camel/providers/local/camel-local-summary.h +++ b/camel/providers/local/camel-local-summary.h @@ -82,7 +82,7 @@ char *camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const Camel int camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info); /* utility functions - write headers to a file with optional X-Evolution header and/or status header */ -int camel_local_summary_write_headers(int fd, struct _header_raw *header, const char *xevline, const char *status, const char *xstatus); +int camel_local_summary_write_headers(int fd, struct _camel_header_raw *header, const char *xevline, const char *status, const char *xstatus); #endif /* ! _CAMEL_LOCAL_SUMMARY_H */ diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c index 2075694f63..37e1ac2ce7 100644 --- a/camel/providers/local/camel-maildir-summary.c +++ b/camel/providers/local/camel-maildir-summary.c @@ -48,7 +48,7 @@ #define CAMEL_MAILDIR_SUMMARY_VERSION (0x2000) static CamelMessageInfo *message_info_load(CamelFolderSummary *s, FILE *in); -static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *); +static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _camel_header_raw *); static void message_info_free(CamelFolderSummary *, CamelMessageInfo *mi); static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex); @@ -256,7 +256,7 @@ static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMe return mi; } -static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _header_raw *h) +static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _camel_header_raw *h) { CamelMessageInfo *mi, *info; CamelMaildirSummary *mds = (CamelMaildirSummary *)s; diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c index 88d2a3e9a7..18cee39e05 100644 --- a/camel/providers/local/camel-mbox-summary.c +++ b/camel/providers/local/camel-mbox-summary.c @@ -49,7 +49,7 @@ static int summary_header_load (CamelFolderSummary *, FILE *); static int summary_header_save (CamelFolderSummary *, FILE *); -static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *); +static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *); static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *); static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *); static int message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *); @@ -187,7 +187,7 @@ summary_header_save(CamelFolderSummary *s, FILE *out) } static CamelMessageInfo * -message_info_new(CamelFolderSummary *s, struct _header_raw *h) +message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h) { CamelMessageInfo *mi; CamelMboxSummary *mbs = (CamelMboxSummary *)s; @@ -204,16 +204,16 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) if (mbs->xstatus) { /* check for existance of status & x-status headers */ - status = header_raw_find(&h, "Status", NULL); + status = camel_header_raw_find(&h, "Status", NULL); if (status) flags = decode_status(status); - xstatus = header_raw_find(&h, "X-Status", NULL); + xstatus = camel_header_raw_find(&h, "X-Status", NULL); if (xstatus) flags |= decode_status(xstatus); } #endif /* if we have an xev header, use it, else assign a new one */ - xev = header_raw_find(&h, "X-Evolution", NULL); + xev = camel_header_raw_find(&h, "X-Evolution", NULL); if (xev != NULL && camel_local_summary_decode_x_evolution((CamelLocalSummary *)s, xev, mi) == 0) { uid = camel_message_info_uid(mi); @@ -667,7 +667,7 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan /* SIGH: encode_param_list is about the only function which folds headers by itself. This should be fixed somehow differently (either parser doesn't fold headers, or param_list doesn't, or something */ - xevtmp = header_unfold(xevnew); + xevtmp = camel_header_unfold(xevnew); /* the raw header contains a leading ' ', so (dis)count that too */ if (strlen(xev)-1 != strlen(xevtmp)) { printf ("strlen(xev)-1 = %d; strlen(xevtmp) = %d\n", strlen(xev)-1, strlen(xevtmp)); diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h index 7813243a69..b72aeda527 100644 --- a/camel/providers/local/camel-spool-summary.h +++ b/camel/providers/local/camel-spool-summary.h @@ -63,7 +63,7 @@ char *camel_spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const Camel int camel_spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *info); /* utility functions - write headers to a file with optional X-Evolution header */ -int camel_spool_summary_write_headers(int fd, struct _header_raw *header, char *xevline); +int camel_spool_summary_write_headers(int fd, struct _camel_header_raw *header, char *xevline); #endif /* ! _CAMEL_SPOOL_SUMMARY_H */ diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c index 9f6ff5f095..50486a2631 100644 --- a/camel/providers/nntp/camel-nntp-summary.c +++ b/camel/providers/nntp/camel-nntp-summary.c @@ -77,7 +77,7 @@ struct _CamelNNTPSummaryPrivate { #define _PRIVATE(o) (((CamelNNTPSummary *)(o))->priv) -static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *); +static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *); static int summary_header_load(CamelFolderSummary *, FILE *); static int summary_header_save(CamelFolderSummary *, FILE *); @@ -165,7 +165,7 @@ camel_nntp_summary_new(CamelNNTPFolder *folder) } static CamelMessageInfo * -message_info_new(CamelFolderSummary *s, struct _header_raw *h) +message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h) { CamelMessageInfo *mi; CamelNNTPSummary *cns = (CamelNNTPSummary *)s; @@ -186,7 +186,8 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) return mi; } -static int summary_header_load(CamelFolderSummary *s, FILE *in) +static int +summary_header_load(CamelFolderSummary *s, FILE *in) { CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s); @@ -198,7 +199,8 @@ static int summary_header_load(CamelFolderSummary *s, FILE *in) return 0; } -static int summary_header_save(CamelFolderSummary *s, FILE *out) +static int +summary_header_save(CamelFolderSummary *s, FILE *out) { CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s); @@ -211,7 +213,8 @@ static int summary_header_save(CamelFolderSummary *s, FILE *out) } /* Assumes we have the stream */ -int camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *changes, CamelException *ex) +int +camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *changes, CamelException *ex) { CamelNNTPStore *store; CamelFolder *folder; @@ -390,7 +393,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came CamelFolder *folder; CamelFolderSummary *s; CamelMessageInfo *mi; - struct _header_raw *headers = NULL; + struct _camel_header_raw *headers = NULL; char *line, *tab; int len, ret; unsigned int n, count, total, size; @@ -433,7 +436,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came if (xover->name) { line += xover->skip; if (line < tab) { - header_raw_append(&headers, xover->name, line, -1); + camel_header_raw_append(&headers, xover->name, line, -1); switch(xover->type) { case XOVER_STRING: break; @@ -468,7 +471,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came cns->priv->uid = NULL; } - header_raw_clear(&headers); + camel_header_raw_clear(&headers); now = time(0); if (last + 2 < now) { diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c index 5f26d7100f..d8000a85ee 100644 --- a/camel/providers/nntp/camel-nntp-utils.c +++ b/camel/providers/nntp/camel-nntp-utils.c @@ -94,7 +94,7 @@ get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder, camel_message_info_set_to(new_info, g_strdup(folder->name)); camel_message_info_set_uid(new_info, uid); - new_info->date_sent = header_decode_date(date, NULL); + new_info->date_sent = camel_header_decode_date(date, NULL); #if 0 /* XXX do we need to fill in both dates? */ new_info->headers.date_received = g_strdup(date); @@ -176,9 +176,8 @@ get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder, } /* create a stream from which to parse the headers */ - header_stream = camel_stream_mem_new_with_buffer(buf, - buf_len, - CAMEL_STREAM_MEM_READ); + header_stream = camel_stream_mem_new_with_buffer (buf, buf_len, + CAMEL_STREAM_MEM_READ); header_array = get_header_array_from_stream (header_stream); @@ -197,7 +196,7 @@ get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder, new_info->message_id = g_strdup(header->value); } else if (!g_strcasecmp(header->name, "Date")) { - new_info->date_sent = header_decode_date (header->value); + new_info->date_sent = camel_header_decode_date (header->value); #if 0 new_info->date_sent = g_strdup(header->value); new_info->date_received = g_strdup(header->value); diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index a0d4ea661f..e2b927858a 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -145,7 +145,7 @@ cmd_builduid(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data) CamelPOP3FolderInfo *fi = data; MD5Context md5; unsigned char digest[16]; - struct _header_raw *h; + struct _camel_header_raw *h; CamelMimeParser *mp; /* TODO; somehow work out the limit and use that for proper progress reporting diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c index 863daf1bca..fbf6f08a6b 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.c +++ b/camel/providers/sendmail/camel-sendmail-transport.c @@ -87,7 +87,7 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message, CamelAddress *from, CamelAddress *recipients, CamelException *ex) { - struct _header_raw *header, *savedbcc, *n, *tail; + struct _camel_header_raw *header, *savedbcc, *n, *tail; const char *from_addr, *addr, **argv; int i, len, fd[2], nullfd, wstat; CamelStreamFilter *filter; @@ -122,9 +122,9 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message, /* unlink the bcc headers */ savedbcc = NULL; - tail = (struct _header_raw *) &savedbcc; + tail = (struct _camel_header_raw *) &savedbcc; - header = (struct _header_raw *) &CAMEL_MIME_PART (message)->headers; + header = (struct _camel_header_raw *) &CAMEL_MIME_PART (message)->headers; n = header->next; while (n != NULL) { if (!strcasecmp (n->name, "Bcc")) { diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 504cbfa2b6..107698cd52 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -1223,7 +1223,7 @@ static gboolean smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message, CamelException *ex) { CamelBestencEncoding enctype = CAMEL_BESTENC_8BIT; - struct _header_raw *header, *savedbcc, *n, *tail; + struct _camel_header_raw *header, *savedbcc, *n, *tail; char *cmdbuf, *respbuf = NULL; CamelStreamFilter *filtered_stream; CamelMimeFilter *crlffilter; @@ -1282,9 +1282,9 @@ smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message, CamelExcept /* unlink the bcc headers */ savedbcc = NULL; - tail = (struct _header_raw *) &savedbcc; + tail = (struct _camel_header_raw *) &savedbcc; - header = (struct _header_raw *) &CAMEL_MIME_PART (message)->headers; + header = (struct _camel_header_raw *) &CAMEL_MIME_PART (message)->headers; n = header->next; while (n != NULL) { if (!strcasecmp (n->name, "Bcc")) { -- cgit v1.2.3