From 440b4825e907c6d67b543a7589c5d37c69b892cd Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 7 Jun 2000 00:07:06 +0000 Subject: Update for folder creation/existence changes. * mail-ops.c (fetch_mail): * folder-browser.c (folder_browser_load_folder): Update for folder creation/existence changes. * message-list.c (message_list_set_folder): Remove the code to create the folder if it doesn't exist, since we don't want to do that. svn path=/trunk/; revision=3455 --- mail/folder-browser.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 90f393b731..da8184993c 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -69,7 +69,6 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) CamelStore *store; CamelFolder *new_folder = NULL; CamelException *ex; - gboolean new_folder_exists = FALSE; ex = camel_exception_new (); @@ -86,7 +85,7 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) store = camel_session_get_store (session, store_name, ex); if (store) { - new_folder = camel_store_get_folder (store, newquery, ex); + new_folder = camel_store_get_folder (store, newquery, TRUE, ex); /* FIXME: do this properly rather than hardcoding */ #warning "Find a way not to hardcode vfolder source" { @@ -99,7 +98,7 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) st = camel_session_get_store (session, stname, ex); g_free (stname); if (st) { - source_folder = camel_store_get_folder (st, "mbox", ex); + source_folder = camel_store_get_folder (st, "mbox", FALSE, ex); if (source_folder) { camel_vee_folder_add_folder(new_folder, source_folder); } @@ -115,7 +114,7 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) store = camel_session_get_store (session, store_name, ex); g_free (store_name); if (store) { - new_folder = camel_store_get_folder (store, "mbox", ex); + new_folder = camel_store_get_folder (store, "mbox", FALSE, ex); } } else { char *msg; @@ -140,23 +139,6 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) return FALSE; } - /* If the folder does not exist, we don't want to show it */ - new_folder_exists = camel_folder_exists (new_folder, ex); - if (camel_exception_get_id (ex)) { - msg = g_strdup_printf ("Unable to test if folder %s " - "exists: %s\n", name, - camel_exception_get_description (ex)); - gnome_error_dialog (msg); - camel_exception_free (ex); - return FALSE; - } - camel_exception_free (ex); - - if (!new_folder_exists) { - gtk_object_unref (GTK_OBJECT (new_folder)); - return FALSE; - } - if (fb->folder) gtk_object_unref (GTK_OBJECT (fb->folder)); -- cgit v1.2.3