From e4b07cd9d139a74d974a484b95f176b5f0d7eb8e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 14 Jun 2000 05:10:55 +0000 Subject: Updated: a separator is now a char* rather than a single char because IMAP 2000-06-14 Jeffrey Stedfast * camel-folder.c (init): Updated: a separator is now a char* rather than a single char because IMAP can have a string for a directory separator. Also, since IMAP does not begin with a directory separator, there is a new argument (path_begins_with_sep) which decides if a directory should begin with a directory separator. * providers/imap/camel-imap-store.c (imap_create): Since, on connect, Camel tries to create INBOX (which already exists on every IMAP provider) we can return TRUE when the folder name is "INBOX". * providers/vee/camel-vee-folder.c (vee_init): Updated. * providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated. * providers/mbox/camel-mbox-store.c (get_folder): Updated. * providers/mbox/camel-mbox-folder.c (mbox_init): Updated. * providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated. svn path=/trunk/; revision=3559 --- camel/providers/mbox/camel-mbox-folder.c | 11 ++++++----- camel/providers/mbox/camel-mbox-store.c | 9 +-------- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'camel/providers/mbox') diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index 07accc5a35..5f8e4a90c8 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -57,8 +57,9 @@ static CamelFolderClass *parent_class=NULL; static void mbox_init (CamelFolder *folder, CamelStore *parent_store, - CamelFolder *parent_folder, const gchar *name, - gchar separator, CamelException *ex); + CamelFolder *parent_folder, const gchar *name, + gchar *separator, gboolean path_begins_with_sep, + CamelException *ex); static void mbox_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex); static void mbox_close (CamelFolder *folder, gboolean expunge, CamelException *ex); @@ -156,15 +157,15 @@ camel_mbox_folder_get_type (void) static void mbox_init (CamelFolder *folder, CamelStore *parent_store, - CamelFolder *parent_folder, const gchar *name, gchar separator, - CamelException *ex) + CamelFolder *parent_folder, const gchar *name, gchar *separator, + gboolean path_begins_with_sep, CamelException *ex) { CamelMboxFolder *mbox_folder = (CamelMboxFolder *)folder; const gchar *root_dir_path; /* call parent method */ parent_class->init (folder, parent_store, parent_folder, - name, separator, ex); + name, separator, path_begins_with_sep, ex); if (camel_exception_get_id (ex)) return; diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c index 6a2b826f9b..c2d53f0072 100644 --- a/camel/providers/mbox/camel-mbox-store.c +++ b/camel/providers/mbox/camel-mbox-store.c @@ -57,8 +57,6 @@ camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class) camel_store_class->get_folder_name = get_folder_name; } - - static void camel_mbox_store_init (gpointer object, gpointer klass) { @@ -71,9 +69,6 @@ camel_mbox_store_init (gpointer object, gpointer klass) store->folders = g_hash_table_new (g_str_hash, g_str_equal); } - - - GtkType camel_mbox_store_get_type (void) { @@ -98,7 +93,6 @@ camel_mbox_store_get_type (void) return camel_mbox_store_type; } - const gchar * camel_mbox_store_get_toplevel_dir (CamelMboxStore *store) { @@ -108,7 +102,6 @@ camel_mbox_store_get_toplevel_dir (CamelMboxStore *store) return url->path; } - static CamelFolder * get_folder (CamelStore *store, const char *folder_name, gboolean create, CamelException *ex) @@ -161,7 +154,7 @@ get_folder (CamelStore *store, const char *folder_name, gboolean create, new_folder = gtk_type_new (CAMEL_MBOX_FOLDER_TYPE); CF_CLASS (new_folder)->init (new_folder, store, NULL, - folder_name, '/', ex); + folder_name, "/", TRUE, ex); return new_folder; } -- cgit v1.2.3