From f6ff30856e2076de585074aabbd616f1a20301fa Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 17 May 2004 04:29:24 +0000 Subject: keep the hide deleted status. Makes #51082 work at last. 2004-05-17 Not Zed * em-folder-view.c (em_folder_view_open_selected): keep the hide deleted status. Makes #51082 work at last. svn path=/trunk/; revision=25916 --- mail/ChangeLog | 3 +++ mail/em-folder-view.c | 1 + mail/em-message-browser.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index ef85773d64..247c66f1d4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2004-05-17 Not Zed + * em-folder-view.c (em_folder_view_open_selected): keep the hide + deleted status. Makes #51082 work at last. + ** Bug #6556. * message-list.c (ml_drop_async_desc, ml_drop_async_drop) diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 4cc5945617..8ed08b64b5 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -368,6 +368,7 @@ em_folder_view_open_selected(EMFolderView *emfv) emmb = (EMMessageBrowser *)em_message_browser_window_new(); message_list_set_threaded(((EMFolderView *)emmb)->list, emfv->list->threaded); + em_folder_view_set_hide_deleted((EMFolderView *)emmb, emfv->hide_deleted); /* FIXME: session needs to be passed easier than this */ em_format_set_session((EMFormat *)((EMFolderView *)emmb)->preview, ((EMFormat *)emfv->preview)->session); em_folder_view_set_folder((EMFolderView *)emmb, emfv->folder, emfv->folder_uri); diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 46cf027771..4f3a2aaa2c 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -237,8 +237,10 @@ emmb_set_message(EMFolderView *emfv, const char *uid, int nomarkseen) emmb_parent->set_message(emfv, uid, nomarkseen); - if (uid == NULL) + if (uid == NULL) { + gtk_widget_destroy((GtkWidget *)emfv); return; + } if ((info = camel_folder_get_message_info (emfv->folder, uid))) { gtk_window_set_title ((GtkWindow *) emmb->window, camel_message_info_subject (info)); -- cgit v1.2.3