diff options
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 67d532433e..df16ba28e1 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -955,9 +955,16 @@ emfv_popup_delete(EPopup *ep, EPopupItem *pitem, void *data) count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED); if (count == 1) { - if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted) + if (!emfv->list->threaded && !message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted) message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0); + else if (emfv->list->threaded) { + if (emfv->hide_deleted) + message_list_select_uid (emfv->list, ""); + else + message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0); + } } + } static void @@ -1332,8 +1339,12 @@ static void emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path) { EMFolderView *emfv = data; - + gboolean selected; + gtk_html_select_all (((EMFormatHTML *)emfv->preview)->html); + selected = gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active"); + bonobo_ui_component_set_prop(emfv->uic, "/commands/EditCopy", "sensitive", selected?"1":"0", NULL); + } static void |