From c7e1b2cbb026ff94c0a7daf4c623b5c4116116bf Mon Sep 17 00:00:00 2001 From: 0 Date: Tue, 11 Sep 2001 00:32:20 +0000 Subject: Dynamically create the folder type list from camel. (reconfigure_clicked): 2001-09-10 * mail-local.c (mail_local_reconfigure_folder): Dynamically create the folder type list from camel. (reconfigure_clicked): And change code to handle changes. 2001-09-10 * merged mail_local patch from peterw. Many changes. svn path=/trunk/; revision=12759 --- mail/folder-browser.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index df9155f554..cadd95035f 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -720,10 +720,6 @@ got_folder(char *uri, CamelFolder *folder, void *data) done: gtk_object_unref (GTK_OBJECT (fb)); - /* Sigh, i dont like this (it can be set in reconfigure folder), - but its just easier right now to do it this way */ - fb->reconfigure = FALSE; - gtk_signal_emit (GTK_OBJECT (fb), folder_browser_signals [FOLDER_LOADED], fb->uri); } @@ -733,12 +729,8 @@ folder_browser_set_uri (FolderBrowser *folder_browser, const char *uri) if (uri && *uri) { gtk_object_ref((GtkObject *)folder_browser); mail_get_folder(uri, got_folder, folder_browser); - } else { - /* Sigh, i dont like this (it can be set in reconfigure folder), - but its just easier right now to do it this way */ - folder_browser->reconfigure = FALSE; } - + return TRUE; } @@ -1370,12 +1362,7 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event char *mailing_list_name = NULL; char *subject_match = NULL, *from_match = NULL; GtkMenu *menu; - - if (fb->reconfigure) { - enable_mask = 0; - goto display_menu; - } - + if (fb->folder != sent_folder) { enable_mask |= CAN_RESEND; hide_mask |= CAN_RESEND; @@ -1763,15 +1750,6 @@ do_message_selected (FolderBrowser *fb) { d(printf ("selecting uid %s (delayed)\n", fb->new_uid ? fb->new_uid : "NONE")); - /* keep polling if we are busy */ - if (fb->reconfigure) { - if (fb->new_uid == NULL) { - mail_display_set_message (fb->mail_display, NULL); - return FALSE; - } - return TRUE; - } - fb->loading_id = 0; /* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */ -- cgit v1.2.3