From 8e212824134c1740d05fb36799f78716c5059801 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 12 Nov 2004 05:53:12 +0000 Subject: ** Merge in notzed-messageinfo-branch, fix some minor conflicts. 2004-11-12 Not Zed ** Merge in notzed-messageinfo-branch, fix some minor conflicts. svn path=/trunk/; revision=27898 --- camel/providers/local/camel-spool-summary.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'camel/providers/local/camel-spool-summary.c') diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c index 3e4fb533ab..c8e074ae99 100644 --- a/camel/providers/local/camel-spool-summary.c +++ b/camel/providers/local/camel-spool-summary.c @@ -106,10 +106,12 @@ camel_spool_summary_finalise(CamelObject *obj) } CamelSpoolSummary * -camel_spool_summary_new(const char *mbox_name) +camel_spool_summary_new(struct _CamelFolder *folder, const char *mbox_name) { CamelSpoolSummary *new = (CamelSpoolSummary *)camel_object_new(camel_spool_summary_get_type()); + ((CamelFolderSummary *)new)->folder = folder; + camel_local_summary_construct((CamelLocalSummary *)new, NULL, mbox_name, NULL); return new; } @@ -318,10 +320,10 @@ spool_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, C work = FALSE; count = camel_folder_summary_count(s); for (i=0;!work && iflags & (CAMEL_MESSAGE_FOLDER_NOXEV)) != 0; - camel_folder_summary_info_free(s, info); + work = (info->info.info.flags & (CAMEL_MESSAGE_FOLDER_NOXEV)) != 0; + camel_message_info_free((CamelMessageInfo *)info); } /* if we do, then write out the headers using sync_full, etc */ -- cgit v1.2.3