Added corba-like exception system to CamelFolder. The exception system is

* Added corba-like exception system to CamelFolder.
The exception system is not finished but I wanted
the async and event implementation to get this right
from the beginning.

svn path=/trunk/; revision=1256

5 files changed, 90 insertions, 90 deletions

diff --git a/camel/providers/MH/camel-mh-folder.c b/camel/providers/MH/camel-mh-folder.c
index ee658b52dd..86bbab46ba 100644
--- a/camel/providers/MH/camel-mh-folder.c
+++ b/camel/providers/MH/camel-mh-folder.c
@@ -51,27 +51,27 @@ static CamelFolderClass *parent_class=NULL;
 #define CMHS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass)
 
 
-static void _set_name(CamelFolder *folder, const gchar *name);
-static void _init_with_store (CamelFolder *folder, CamelStore *parent_store);
-static gboolean _exists (CamelFolder *folder);
-static gboolean _create(CamelFolder *folder);
-static gboolean _delete (CamelFolder *folder, gboolean recurse);
-static gboolean _delete_messages (CamelFolder *folder);
-static GList *_list_subfolders (CamelFolder *folder);
-static CamelMimeMessage *_get_message (CamelFolder *folder, gint number);
-static gint _get_message_count (CamelFolder *folder);
-static gint _append_message (CamelFolder *folder, CamelMimeMessage *message);
-static void _expunge (CamelFolder *folder);
-static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder);
-static void _open (CamelFolder *folder, CamelFolderOpenMode mode);
-static void _close (CamelFolder *folder, gboolean expunge);
-
-static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message);
-static CamelMimeMessage *_get_message_by_uid (CamelFolder *folder, const gchar *uid);
-static GList *_get_uid_list  (CamelFolder *folder);
+static void _set_name(CamelFolder *folder, const gchar *name, CamelException *ex);
+static void _init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex);
+static gboolean _exists (CamelFolder *folder, CamelException *ex);
+static gboolean _create(CamelFolder *folder, CamelException *ex);
+static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);
+static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);
+static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);
+static CamelMimeMessage *_get_message (CamelFolder *folder, gint number, CamelException *ex);
+static gint _get_message_count (CamelFolder *folder, CamelException *ex);
+static gint _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);
+static void _expunge (CamelFolder *folder, CamelException *ex);
+static void _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex);
+static void _open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex);
+static void _close (CamelFolder *folder, gboolean expunge, CamelException *ex);
+
+static const gchar *_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex);
+static CamelMimeMessage *_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex);
+static GList *_get_uid_list  (CamelFolder *folder, CamelException *ex);
 
 /* some utility functions */
-static int copy_reg (const char *src_path, const char *dst_path);
+static int copy_reg (const char *src_path, const char *dst_path, CamelException *ex);
 
 static void
 camel_mh_folder_class_init (CamelMhFolderClass *camel_mh_folder_class)
@@ -145,10 +145,10 @@ _message_name_compare (gconstpointer a, gconstpointer b)
 
 
 static void 
-_init_with_store (CamelFolder *folder, CamelStore *parent_store)
+_init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex)
 {
 	/* call parent method */
-	parent_class->init_with_store (folder, parent_store);
+	parent_class->init_with_store (folder, parent_store, ex);
 	
 	folder->can_hold_messages = TRUE;
 	folder->can_hold_folders = TRUE;
@@ -162,7 +162,7 @@ _init_with_store (CamelFolder *folder, CamelStore *parent_store)
 
 
 static void
-_open (CamelFolder *folder, CamelFolderOpenMode mode)
+_open (CamelFolder *folder, CamelFolderOpenMode mode, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 	struct dirent *dir_entry;
@@ -205,7 +205,7 @@ _open (CamelFolder *folder, CamelFolderOpenMode mode)
 
 
 static void
-_close (CamelFolder *folder, gboolean expunge)
+_close (CamelFolder *folder, gboolean expunge, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 
@@ -218,7 +218,7 @@ _close (CamelFolder *folder, gboolean expunge)
 		mh_save_summary (mh_folder);
 	
 	/* call parent implementation */
-	parent_class->close (folder, expunge);
+	parent_class->close (folder, expunge, ex);
 }
 
 
@@ -234,7 +234,7 @@ _close (CamelFolder *folder, gboolean expunge)
  * 
  **/
 static void
-_set_name (CamelFolder *folder, const gchar *name)
+_set_name (CamelFolder *folder, const gchar *name, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 	const gchar *root_dir_path;
@@ -248,7 +248,7 @@ _set_name (CamelFolder *folder, const gchar *name)
 	g_assert (folder->parent_store);
 
 	/* call default implementation */
-	parent_class->set_name (folder, name);
+	parent_class->set_name (folder, name, ex);
 	
 	if (mh_folder->directory_path) g_free (mh_folder->directory_path);
 	
@@ -261,7 +261,7 @@ _set_name (CamelFolder *folder, const gchar *name)
 
 	mh_folder->directory_path = g_strdup_printf ("%s%c%s", root_dir_path, separator, folder->full_name);
 	
-	if (!camel_folder_exists (folder)) return;
+	if (!camel_folder_exists (folder, ex)) return;
 	
 	
 	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::set_name mh_folder->directory_path is %s\n", 
@@ -272,7 +272,7 @@ _set_name (CamelFolder *folder, const gchar *name)
 
 
 static gboolean
-_exists (CamelFolder *folder)
+_exists (CamelFolder *folder, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
 	struct stat stat_buf;
@@ -299,7 +299,7 @@ _exists (CamelFolder *folder)
 
 
 static gboolean
-_create (CamelFolder *folder)
+_create (CamelFolder *folder, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
 	const gchar *directory_path;
@@ -309,12 +309,12 @@ _create (CamelFolder *folder)
 	g_assert(folder);
 
 	/* call default implementation */
-	parent_class->create (folder);
+	parent_class->create (folder, ex);
 
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return FALSE;
 	
-	if (camel_folder_exists (folder)) return TRUE;
+	if (camel_folder_exists (folder, ex)) return TRUE;
 	
 	mkdir_error = mkdir (directory_path, dir_mode);
 	return (mkdir_error == -1);
@@ -323,7 +323,7 @@ _create (CamelFolder *folder)
 
 
 static gboolean
-_delete (CamelFolder *folder, gboolean recurse)
+_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)
 {
 
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
@@ -333,7 +333,7 @@ _delete (CamelFolder *folder, gboolean recurse)
 	g_assert(folder);
 
 	/* call default implementation */
-	parent_class->delete (folder, recurse);
+	parent_class->delete (folder, recurse, ex);
 	/* the default implementation will care about deleting 
 	   messages first and recursing the operation if 
 	   necessary */
@@ -341,7 +341,7 @@ _delete (CamelFolder *folder, gboolean recurse)
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return FALSE;
 	
-	if (!camel_folder_exists (folder)) return TRUE;
+	if (!camel_folder_exists (folder, ex)) return TRUE;
 	
 	/* physically delete the directory */
 	CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::delete removing directory %s\n", directory_path);
@@ -356,7 +356,7 @@ _delete (CamelFolder *folder, gboolean recurse)
 
 
 static gboolean 
-_delete_messages (CamelFolder *folder)
+_delete_messages (CamelFolder *folder, CamelException *ex)
 {
 	
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
@@ -371,12 +371,12 @@ _delete_messages (CamelFolder *folder)
 	g_assert(folder);
 
 	/* call default implementation */
-	parent_class->delete_messages (folder);
+	parent_class->delete_messages (folder, ex);
 
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return FALSE;
 	
-	if (!camel_folder_exists (folder)) return TRUE;
+	if (!camel_folder_exists (folder, ex)) return TRUE;
 	
 	dir_handle = opendir (directory_path);
 	
@@ -413,7 +413,7 @@ _delete_messages (CamelFolder *folder)
 
 
 static GList *
-_list_subfolders (CamelFolder *folder)
+_list_subfolders (CamelFolder *folder, CamelException *ex)
 {
 	GList *subfolder_name_list = NULL;
 
@@ -430,12 +430,12 @@ _list_subfolders (CamelFolder *folder)
 	g_assert(folder);
 
 	/* call default implementation */
-	parent_class->delete_messages (folder);
+	parent_class->delete_messages (folder, ex);
 
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return NULL;
 	
-	if (!camel_folder_exists (folder)) return NULL;
+	if (!camel_folder_exists (folder, ex)) return NULL;
 	
 	dir_handle = opendir (directory_path);
 	
@@ -480,7 +480,7 @@ _filename_free (gpointer data)
 /* slow routine, may be optimixed, or we should use
    caches if users complain */
 static CamelMimeMessage *
-_get_message (CamelFolder *folder, gint number)
+_get_message (CamelFolder *folder, gint number, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
 	const gchar *directory_path;
@@ -528,7 +528,7 @@ _get_message (CamelFolder *folder, gint number)
 
 
 static gint
-_get_message_count (CamelFolder *folder)
+_get_message_count (CamelFolder *folder, CamelException *ex)
 {
 	
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
@@ -542,7 +542,7 @@ _get_message_count (CamelFolder *folder)
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return -1;
 	
-	if (!camel_folder_exists (folder)) return 0;
+	if (!camel_folder_exists (folder, ex)) return 0;
 	
 	dir_handle = opendir (directory_path);
 	
@@ -564,7 +564,7 @@ _get_message_count (CamelFolder *folder)
 
 
 static gboolean
-_find_next_free_message_file (CamelFolder *folder, gint *new_msg_number, gchar **new_msg_filename)
+_find_next_free_message_file (CamelFolder *folder, gint *new_msg_number, gchar **new_msg_filename, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);
 	const gchar *directory_path;
@@ -578,7 +578,7 @@ _find_next_free_message_file (CamelFolder *folder, gint *new_msg_number, gchar *
 	directory_path = mh_folder->directory_path;
 	if (!directory_path) return FALSE;
 	
-	if (!camel_folder_exists (folder)) return FALSE;
+	if (!camel_folder_exists (folder, ex)) return FALSE;
 	
 	dir_handle = opendir (directory_path);
 	
@@ -606,7 +606,7 @@ _find_next_free_message_file (CamelFolder *folder, gint *new_msg_number, gchar *
 	
 }
 static gint
-_append_message (CamelFolder *folder, CamelMimeMessage *message)
+_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)
 {
 	guint new_msg_number;
 	gchar *new_msg_filename;
@@ -614,7 +614,7 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message)
 	gboolean error;
 
 	CAMEL_LOG_FULL_DEBUG ("Entering CamelMhFolder::append_message\n");
-	if (!_find_next_free_message_file (folder, &new_msg_number, &new_msg_filename))
+	if (!_find_next_free_message_file (folder, &new_msg_number, &new_msg_filename, ex))
 		return -1;
 
 	output_stream = camel_stream_fs_new_with_name (new_msg_filename, CAMEL_STREAM_FS_WRITE);
@@ -639,7 +639,7 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message)
 
 
 static void
-_expunge (CamelFolder *folder)
+_expunge (CamelFolder *folder, CamelException *ex)
 {
 	/* For the moment, we look in the folder active message
 	 * list. I did not make my mind for the moment, should 
@@ -691,7 +691,7 @@ _expunge (CamelFolder *folder)
 
 
 static void
-_copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder)
+_copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *dest_folder, CamelException *ex)
 {
 	gchar *src_msg_filename;
 	guint dest_msg_number;
@@ -700,14 +700,14 @@ _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *d
 	if (IS_CAMEL_MH_FOLDER (dest_folder)) {
 		/*g_return_if_fail (message->parent_folder == folder);*/
 		
-		if (!_find_next_free_message_file (dest_folder, &dest_msg_number, &dest_msg_filename))
+		if (!_find_next_free_message_file (dest_folder, &dest_msg_number, &dest_msg_filename, ex))
 			return;
 		src_msg_filename = gtk_object_get_data (GTK_OBJECT (message), "fullpath");
 		CAMEL_LOG_FULL_DEBUG ("CamelMhFolder::copy_to copy file %s to %s\n", src_msg_filename, dest_msg_filename);
-		copy_reg (src_msg_filename, dest_msg_filename);
+		copy_reg (src_msg_filename, dest_msg_filename, ex);
 		
 	} else 
-		parent_class->copy_message_to (folder, message, dest_folder);
+		parent_class->copy_message_to (folder, message, dest_folder, ex);
 }
 
 
@@ -715,7 +715,7 @@ _copy_message_to (CamelFolder *folder, CamelMimeMessage *message, CamelFolder *d
 /** UID **/
 
 static const gchar *
-_get_message_uid (CamelFolder *folder, CamelMimeMessage *message)
+_get_message_uid (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 	GArray *uid_array;
@@ -751,7 +751,7 @@ _get_message_uid (CamelFolder *folder, CamelMimeMessage *message)
 
 
 static CamelMimeMessage *
-_get_message_by_uid (CamelFolder *folder, const gchar *uid)
+_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 	GArray *uid_array;
@@ -801,7 +801,7 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid)
 }
 
 static GList *
-_get_uid_list  (CamelFolder *folder)
+_get_uid_list  (CamelFolder *folder, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);
 	GList *uid_list;
@@ -862,7 +862,7 @@ full_write (int desc, const char *ptr, size_t len)
 
 
 static int
-copy_reg (const char *src_path, const char *dst_path)
+copy_reg (const char *src_path, const char *dst_path, CamelException *ex)
 {
   char *buf;
   int buf_size;
diff --git a/camel/providers/MH/camel-mh-store.c b/camel/providers/MH/camel-mh-store.c
index 24a8c8a72c..60ba07f47b 100644
--- a/camel/providers/MH/camel-mh-store.c
+++ b/camel/providers/MH/camel-mh-store.c
@@ -145,8 +145,8 @@ _get_folder (CamelStore *store, const gchar *folder_name)
 	new_mh_folder =  gtk_type_new (CAMEL_MH_FOLDER_TYPE);
 	new_folder = CAMEL_FOLDER (new_mh_folder);
 
-	CF_CLASS (new_folder)->init_with_store (new_folder, store);
-	CF_CLASS (new_folder)->set_name (new_folder, folder_name);
+	CF_CLASS (new_folder)->init_with_store (new_folder, store, NULL);
+	CF_CLASS (new_folder)->set_name (new_folder, folder_name, NULL);
 	
 	
 	return new_folder;
diff --git a/camel/providers/MH/mh-uid.c b/camel/providers/MH/mh-uid.c
index 425cc27697..7dbde4de00 100644
--- a/camel/providers/MH/mh-uid.c
+++ b/camel/providers/MH/mh-uid.c
@@ -182,7 +182,7 @@ mh_generate_uid_list (CamelMhFolder *mh_folder)
 		return -1;
 	}
 		
-	msg_count = camel_folder_get_message_count (CAMEL_FOLDER (mh_folder));
+	msg_count = camel_folder_get_message_count (CAMEL_FOLDER (mh_folder), NULL);
 	if (!msg_count) {
 		CAMEL_LOG_FULL_DEBUG ("no message in %s. Exiting\n", directory_path);
 		return -1;
diff --git a/camel/providers/maildir/camel-maildir-folder.c b/camel/providers/maildir/camel-maildir-folder.c
index ea0302cbd1..4ad5409658 100644
--- a/camel/providers/maildir/camel-maildir-folder.c
+++ b/camel/providers/maildir/camel-maildir-folder.c
@@ -50,16 +50,16 @@ static CamelFolderClass *parent_class=NULL;
 #define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass)
 #define CMAILDIRS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass)
 
-static void _init_with_store (CamelFolder *folder, CamelStore *parent_store);
-static void _set_name (CamelFolder *folder, const gchar *name);
-static gboolean _exists (CamelFolder *folder);
-static gboolean _create (CamelFolder *folder);
-static gboolean _delete (CamelFolder *folder, gboolean recurse);
-static gboolean _delete_messages (CamelFolder *folder);
-static CamelMimeMessage *_get_message (CamelFolder *folder, gint number);
-static gint _get_message_count (CamelFolder *folder);
-static void _expunge (CamelFolder *folder);
-static GList *_list_subfolders (CamelFolder *folder);
+static void _init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex);
+static void _set_name (CamelFolder *folder, const gchar *name, CamelException *ex);
+static gboolean _exists (CamelFolder *folder, CamelException *ex);
+static gboolean _create (CamelFolder *folder, CamelException *ex);
+static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);
+static gboolean _delete_messages (CamelFolder *folder, CamelException *ex);
+static CamelMimeMessage *_get_message (CamelFolder *folder, gint number, CamelException *ex);
+static gint _get_message_count (CamelFolder *folder, CamelException *ex);
+static void _expunge (CamelFolder *folder, CamelException *ex);
+static GList *_list_subfolders (CamelFolder *folder, CamelException *ex);
 
 /* fs utility functions */
 static DIR * _xopendir (const gchar *path);
@@ -131,14 +131,14 @@ camel_maildir_folder_get_type (void)
  * Perhaps we'll later implement subfolders too...
  */
 static void 
-_init_with_store (CamelFolder *folder, CamelStore *parent_store)
+_init_with_store (CamelFolder *folder, CamelStore *parent_store, CamelException *ex)
 {
 	CAMEL_LOG_FULL_DEBUG ("Entering CamelMaildirFolder::init_with_store\n");
 	g_assert (folder);
 	g_assert (parent_store);
 	
 	/* call parent method */
-	parent_class->init_with_store (folder, parent_store);
+	parent_class->init_with_store (folder, parent_store, ex);
 	
 	folder->can_hold_messages = TRUE;
 	folder->can_hold_folders = TRUE;
@@ -156,7 +156,7 @@ _init_with_store (CamelFolder *folder, CamelStore *parent_store)
  * the given name is not checked in this function.
  */
 static void
-_set_name (CamelFolder *folder, const gchar *name)
+_set_name (CamelFolder *folder, const gchar *name, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder;
 	CamelMaildirStore *maildir_store;
@@ -170,7 +170,7 @@ _set_name (CamelFolder *folder, const gchar *name)
 	maildir_store = CAMEL_MAILDIR_STORE (folder->parent_store);
 
 	/* call default implementation */
-	parent_class->set_name (folder, name);
+	parent_class->set_name (folder, name, ex);
 	
 	if (maildir_folder->directory_path)
 		g_free (maildir_folder->directory_path);
@@ -205,7 +205,7 @@ _set_name (CamelFolder *folder, const gchar *name)
  * Return value: TRUE if the maildir exists, FALSE otherwise
  */
 static gboolean
-_exists (CamelFolder *folder)
+_exists (CamelFolder *folder, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
 	static const gchar *dir[3] = { "new", "cur", "tmp" };
@@ -258,7 +258,7 @@ _exists (CamelFolder *folder)
  *               FALSE otherwise
  */
 static gboolean
-_create (CamelFolder *folder)
+_create (CamelFolder *folder, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
 	static const gchar *dir[3] = { "new", "cur", "tmp" };
@@ -271,7 +271,7 @@ _create (CamelFolder *folder)
 	g_assert (folder);
 
 	/* check whether the maildir already exists */
-	if (camel_folder_exists (folder)) return TRUE;
+	if (camel_folder_exists (folder, ex)) return TRUE;
 
 	maildir = maildir_folder->directory_path;
 
@@ -309,7 +309,7 @@ _create (CamelFolder *folder)
  * maildir directory won't be removed, but it might no longer be a valid maildir.
  */
 static gboolean
-_delete (CamelFolder *folder, gboolean recurse)
+_delete (CamelFolder *folder, gboolean recurse, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
 	static const gchar *dir[3] = { "new", "cur", "tmp" };
@@ -322,7 +322,7 @@ _delete (CamelFolder *folder, gboolean recurse)
 	g_assert (folder);
 
 	/* check whether the maildir already exists */
-	if (!camel_folder_exists (folder)) return TRUE;
+	if (!camel_folder_exists (folder, ex)) return TRUE;
 
 	maildir = maildir_folder->directory_path;
 
@@ -367,7 +367,7 @@ _delete (CamelFolder *folder, gboolean recurse)
  *               TRUE otherwise.
  */
 static gboolean 
-_delete_messages (CamelFolder *folder)
+_delete_messages (CamelFolder *folder, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
 	const gchar *maildir;
@@ -380,10 +380,10 @@ _delete_messages (CamelFolder *folder)
 	g_assert (folder);
 
 	/* call default implementation */
-	parent_class->delete_messages (folder);
+	parent_class->delete_messages (folder, ex);
 
 	/* Check if the folder didn't exist */
-	if (!camel_folder_exists (folder)) return TRUE;
+	if (!camel_folder_exists (folder, ex)) return TRUE;
 
 	maildir = maildir_folder->directory_path;
 
@@ -424,7 +424,7 @@ _delete_messages (CamelFolder *folder)
  * Return value: the message, NULL on error
  */
 static CamelMimeMessage *
-_get_message (CamelFolder *folder, gint number)
+_get_message (CamelFolder *folder, gint number, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);
 	DIR *dir_handle;
@@ -439,7 +439,7 @@ _get_message (CamelFolder *folder, gint number)
 	g_assert(folder);
 
 	/* Check if the folder exists */
-	if (!camel_folder_exists (folder)) return NULL;
+	if (!camel_folder_exists (folder, ex)) return NULL;
 
 	maildir = maildir_folder->directory_path;
 
@@ -495,7 +495,7 @@ _get_message (CamelFolder *folder, gint number)
  * Return value: number of messages in the maildir, -1 on error
  */
 static gint
-_get_message_count (CamelFolder *folder)
+_get_message_count (CamelFolder *folder, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(folder);
 	const gchar *maildir;
@@ -509,7 +509,7 @@ _get_message_count (CamelFolder *folder)
 	g_assert(folder);
 
 	/* check if the maildir exists */
-	if (!camel_folder_exists (folder)) return -1;
+	if (!camel_folder_exists (folder, ex)) return -1;
 
 	maildir = maildir_folder->directory_path;
 
@@ -564,7 +564,7 @@ _get_message_count (CamelFolder *folder)
  * Physically deletes the messages marked as deleted in the folder.
  */
 static void
-_expunge (CamelFolder *folder)
+_expunge (CamelFolder *folder, CamelException *ex)
 {
 	CamelMimeMessage *message;
 	GList *node;
@@ -618,7 +618,7 @@ _expunge (CamelFolder *folder)
  * Return value: list of subfolder names
  */
 static GList *
-_list_subfolders (CamelFolder *folder)
+_list_subfolders (CamelFolder *folder, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER (folder);
 	const gchar *maildir;
@@ -632,7 +632,7 @@ _list_subfolders (CamelFolder *folder)
 	g_assert (folder);
 
 	/* check if the maildir exists */
-	if (!camel_folder_exists (folder)) return NULL;
+	if (!camel_folder_exists (folder, ex)) return NULL;
 
 	/* scan through the maildir toplevel directory */
 	maildir = maildir_folder->directory_path;
diff --git a/camel/providers/maildir/camel-maildir-store.c b/camel/providers/maildir/camel-maildir-store.c
index 0e296699a9..8f37494003 100644
--- a/camel/providers/maildir/camel-maildir-store.c
+++ b/camel/providers/maildir/camel-maildir-store.c
@@ -117,8 +117,8 @@ _get_folder (CamelStore *store, const gchar *folder_name)
 	new_maildir_folder = gtk_type_new (CAMEL_MAILDIR_FOLDER_TYPE);
 	new_folder = CAMEL_FOLDER (new_maildir_folder);
 
-	CF_CLASS (new_folder)->init_with_store (new_folder, store);
-	CF_CLASS (new_folder)->set_name (new_folder, folder_name);
+	CF_CLASS (new_folder)->init_with_store (new_folder, store, NULL);
+	CF_CLASS (new_folder)->set_name (new_folder, folder_name, NULL);
 	
 	return new_folder;
 }