fix removal of journal file, and remove the cmeta state file too.

2004-01-09  Not Zed  <NotZed@Ximian.com>

        * providers/imap/camel-imap-store.c (imap_forget_folder): fix
        removal of journal file, and remove the cmeta state file too.

        * providers/imap/camel-imap-folder.c (imap_getv): count up so we
        call parent class if we missed any, rather than only if we didn't
        miss any.
        (imap_rename): rename the object state file.
        (camel_imap_folder_new): set the object state file for persistent
        properties.

        * camel-disco-folder.c (disco_getv): support
        (PERSISTENT_)PROPERTIES & OFFLINE_SYNC.
        (disco_setv): implement OFFLINE_SYNC.
        (camel_disco_folder_get_type): setup disco properties list.
        (cdf_folder_changed): honour the offline_sync setting on the
        current folder.
        (disco_sync): save object state.
        (disco_setv): save object state if it changed.

svn path=/trunk/; revision=24126

1 files changed, 6 insertions, 2 deletions

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 4b4250da18..d8ff6e0ec7 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1042,7 +1042,7 @@ imap_forget_folder (CamelImapStore *imap_store, const char *folder_name, CamelEx
 {
 	CamelFolderSummary *summary;
 	CamelImapMessageCache *cache;
-	char *summary_file;
+	char *summary_file, *state_file;
 	char *journal_file;
 	char *folder_dir, *storage_path;
 	CamelFolderInfo *fi;
@@ -1080,9 +1080,13 @@ imap_forget_folder (CamelImapStore *imap_store, const char *folder_name, CamelEx
 	unlink (summary_file);
 	g_free (summary_file);
 	
-	journal_file = g_strdup_printf ("%s/summary", folder_dir);
+	journal_file = g_strdup_printf ("%s/journal", folder_dir);
 	unlink (journal_file);
 	g_free (journal_file);
+
+	state_file = g_strdup_printf ("%s/cmeta", folder_dir);
+	unlink (state_file);
+	g_free (state_file);
 	
 	rmdir (folder_dir);
 	g_free (folder_dir);