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/providers/nntp/camel-nntp-summary.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/providers/nntp/camel-nntp-summary.c')
-rw-r--r-- | camel/providers/nntp/camel-nntp-summary.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c index 2a9669d697..9f6ff5f095 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 _camel_header_raw *); +static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _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 _camel_header_raw *h) +message_info_new(CamelFolderSummary *s, struct _header_raw *h) { CamelMessageInfo *mi; CamelNNTPSummary *cns = (CamelNNTPSummary *)s; @@ -186,8 +186,7 @@ message_info_new(CamelFolderSummary *s, struct _camel_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); @@ -199,8 +198,7 @@ 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); @@ -213,8 +211,7 @@ 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; @@ -393,7 +390,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came CamelFolder *folder; CamelFolderSummary *s; CamelMessageInfo *mi; - struct _camel_header_raw *headers = NULL; + struct _header_raw *headers = NULL; char *line, *tab; int len, ret; unsigned int n, count, total, size; @@ -436,7 +433,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came if (xover->name) { line += xover->skip; if (line < tab) { - camel_header_raw_append(&headers, xover->name, line, -1); + header_raw_append(&headers, xover->name, line, -1); switch(xover->type) { case XOVER_STRING: break; @@ -471,7 +468,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came cns->priv->uid = NULL; } - camel_header_raw_clear(&headers); + header_raw_clear(&headers); now = time(0); if (last + 2 < now) { @@ -536,7 +533,7 @@ add_range_head(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Camel if (camel_mime_parser_init_with_stream(mp, (CamelStream *)store->stream) == -1) goto error; mi = camel_folder_summary_add_from_parser(s, mp); - while (camel_mime_parser_step(mp, NULL, NULL) != CAMEL_MIME_PARSER_STATE_EOF) + while (camel_mime_parser_step(mp, NULL, NULL) != HSCAN_EOF) ; if (mi == NULL) { goto error; |