diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/component-factory.c | 7 | ||||
| -rw-r--r-- | mail/mail-ops.c | 11 | ||||
| -rw-r--r-- | mail/message-list.c | 7 |
4 files changed, 10 insertions, 20 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index c023d9dbed..27ea9425d3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2000-06-15 Dan Winship <danw@helixcode.com> + * mail-ops.c (fetch_mail): + * component-factory.c (owner_unset_cb): + * message-list.c (message_list_set_folder): Update for CamelFolder + changes. + * folder-browser.c (folder_browser_clear_search): New function to revert back to non-searching mode. diff --git a/mail/component-factory.c b/mail/component-factory.c index 605789854f..0dc2700f3e 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -127,13 +127,12 @@ owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data) { FolderBrowser *fb; - /* Close each open folder to make them sync their state to - * disk. We should do more cleanup than this, but then, we shouldn't - * be just exiting here either. FIXME. + /* Sync each open folder. We should do more cleanup than this, + * but then, we shouldn't be just exiting here either. FIXME. */ while (browsers) { fb = browsers->data; - camel_folder_close (fb->folder, FALSE, NULL); + camel_folder_sync (fb->folder, FALSE, NULL); browsers = browsers->next; } diff --git a/mail/mail-ops.c b/mail/mail-ops.c index b192f2244c..81cb5ae139 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -145,8 +145,6 @@ fetch_mail (GtkWidget *button, gpointer user_data) folder = camel_store_get_folder (fb->folder->parent_store, strrchr (tmp_mbox, '/') + 1, FALSE, ex); - camel_folder_open (folder, FOLDER_OPEN_READ, ex); - if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) { mail_exception_dialog ("Unable to move mail", ex, fb); goto cleanup; @@ -168,7 +166,6 @@ fetch_mail (GtkWidget *button, gpointer user_data) sourcefolder = camel_store_get_folder (store, "inbox", FALSE, ex); - camel_folder_open (sourcefolder, FOLDER_OPEN_READ, ex); if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) { mail_exception_dialog ("Unable to get new mail", ex, fb); goto cleanup; @@ -185,9 +182,6 @@ fetch_mail (GtkWidget *button, gpointer user_data) folder = camel_store_get_folder (fb->folder->parent_store, strrchr (tmp_mbox, '/') + 1, TRUE, ex); - - camel_folder_open(folder, FOLDER_OPEN_RW, ex); - if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) { mail_exception_dialog ("Unable to move mail", ex, fb); goto cleanup; @@ -218,7 +212,7 @@ fetch_mail (GtkWidget *button, gpointer user_data) gtk_object_unref((GtkObject *)msg); } camel_folder_free_uids (sourcefolder, uids); - camel_folder_close (sourcefolder, TRUE, ex); + camel_folder_sync (sourcefolder, TRUE, ex); if (camel_exception_is_set (ex)) mail_exception_dialog ("", ex, fb); gtk_object_unref((GtkObject *)sourcefolder); @@ -265,8 +259,7 @@ fetch_mail (GtkWidget *button, gpointer user_data) if (url) g_free (url); if (folder) { - if (camel_folder_is_open (folder)) - camel_folder_close (folder, TRUE, ex); + camel_folder_sync (folder, TRUE, ex); gtk_object_unref (GTK_OBJECT (folder)); } if (store) { diff --git a/mail/message-list.c b/mail/message-list.c index 88185c8e98..05db369fc7 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -870,13 +870,6 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder) gtk_object_unref (GTK_OBJECT (message_list->folder)); message_list->folder = camel_folder; - - camel_folder_open (camel_folder, FOLDER_OPEN_RW, &ex); - if (camel_exception_get_id (&ex)) { - printf ("Unable to open folder: %s\n", - ex.desc?ex.desc:"unknown_reason"); - return; - } gtk_signal_connect((GtkObject *)camel_folder, "folder_changed", folder_changed, message_list); |