diff options
Diffstat (limited to 'camel/providers/mbox')
-rw-r--r-- | camel/providers/mbox/camel-mbox-folder.c | 4 | ||||
-rw-r--r-- | camel/providers/mbox/camel-mbox-store.c | 18 | ||||
-rw-r--r-- | camel/providers/mbox/camel-mbox-store.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index 0392628284..e3638e23d4 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -346,8 +346,8 @@ _set_name (CamelFolder *folder, const gchar *name, CamelException *ex) g_free (mbox_folder->folder_file_path); g_free (mbox_folder->folder_dir_path); - separator = camel_store_get_separator (folder->parent_store); - root_dir_path = camel_mbox_store_get_toplevel_dir (CAMEL_MBOX_STORE(folder->parent_store)); + separator = camel_store_get_separator (folder->parent_store, ex); + root_dir_path = camel_mbox_store_get_toplevel_dir (CAMEL_MBOX_STORE(folder->parent_store), ex); CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name full_name is %s\n", folder->full_name); CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name root_dir_path is %s\n", root_dir_path); diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c index 83704ea018..f8b3b62718 100644 --- a/camel/providers/mbox/camel-mbox-store.c +++ b/camel/providers/mbox/camel-mbox-store.c @@ -32,8 +32,8 @@ static CamelStoreClass *parent_class=NULL; #define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass) #define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (GTK_OBJECT(so)->klass) -static void _init (CamelStore *store, CamelSession *session, const gchar *url_name); -static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name); +static void _init (CamelStore *store, CamelSession *session, const gchar *url_name, CamelException *ex); +static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name, CamelException *ex); static void @@ -92,7 +92,7 @@ camel_mbox_store_get_type (void) /* These evil public functions are here for test only */ void -camel_mbox_store_set_toplevel_dir (CamelMboxStore *store, const gchar *toplevel) +camel_mbox_store_set_toplevel_dir (CamelMboxStore *store, const gchar *toplevel, CamelException *ex) { store->toplevel_dir = g_strdup (toplevel); CAMEL_STORE(store)->separator = '/'; @@ -100,7 +100,7 @@ camel_mbox_store_set_toplevel_dir (CamelMboxStore *store, const gchar *toplevel) const gchar * -camel_mbox_store_get_toplevel_dir (CamelMboxStore *store) +camel_mbox_store_get_toplevel_dir (CamelMboxStore *store, CamelException *ex) { return store->toplevel_dir; } @@ -108,14 +108,14 @@ camel_mbox_store_get_toplevel_dir (CamelMboxStore *store) static void -_init (CamelStore *store, CamelSession *session, const gchar *url_name) +_init (CamelStore *store, CamelSession *session, const gchar *url_name, CamelException *ex) { CamelMboxStore *mbox_store = CAMEL_MBOX_STORE (store); Gurl *store_url; g_assert (url_name); /* call parent implementation */ - parent_class->init (store, session, url_name); + parent_class->init (store, session, url_name, ex); /* find the path in the URL*/ @@ -133,7 +133,7 @@ _init (CamelStore *store, CamelSession *session, const gchar *url_name) static CamelFolder * -_get_folder (CamelStore *store, const gchar *folder_name) +_get_folder (CamelStore *store, const gchar *folder_name, CamelException *ex) { CamelMboxFolder *new_mbox_folder; CamelFolder *new_folder; @@ -145,8 +145,8 @@ _get_folder (CamelStore *store, const gchar *folder_name) new_mbox_folder = gtk_type_new (CAMEL_MBOX_FOLDER_TYPE); new_folder = CAMEL_FOLDER (new_mbox_folder); - CF_CLASS (new_folder)->init_with_store (new_folder, store, NULL); - CF_CLASS (new_folder)->set_name (new_folder, folder_name, NULL); + CF_CLASS (new_folder)->init_with_store (new_folder, store, ex); + CF_CLASS (new_folder)->set_name (new_folder, folder_name, ex); return new_folder; diff --git a/camel/providers/mbox/camel-mbox-store.h b/camel/providers/mbox/camel-mbox-store.h index 8033d9d695..a5aea965e2 100644 --- a/camel/providers/mbox/camel-mbox-store.h +++ b/camel/providers/mbox/camel-mbox-store.h @@ -60,8 +60,8 @@ typedef struct { /* Standard Gtk function */ GtkType camel_mbox_store_get_type (void); -void camel_mbox_store_set_toplevel_dir (CamelMboxStore *store, const gchar *toplevel); -const gchar *camel_mbox_store_get_toplevel_dir (CamelMboxStore *store); +void camel_mbox_store_set_toplevel_dir (CamelMboxStore *store, const gchar *toplevel, CamelException *ex); +const gchar *camel_mbox_store_get_toplevel_dir (CamelMboxStore *store, CamelException *ex); #ifdef __cplusplus } |