diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cf3bef97d4..fa12d5dfe7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,4 +1,11 @@ +2001-08-01 Jason Leach <jleach@ximian.com> + + * mail-callbacks.c (delete_msg): Don't move cursors around when + deleting last message and Hide Deleted Messages isn't enabled. + Bug #5928. + 2001-07-31 Anna Marie Dirks <anna@ximian.com> + * mail-mt.c (do_get_pass): Changed the title of this dialog to "Enter Password". diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index b70e12185e..ebe0907719 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1575,10 +1575,12 @@ delete_msg (GtkWidget *button, gpointer user_data) row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); - /* If this is the last message, select the previous */ - if (row+1 == e_tree_row_count (fb->message_list->tree)) + /* If this is the last message and deleted messages + are hidden, select the previous */ + if ((row+1 == e_tree_row_count (fb->message_list->tree)) + && mail_config_get_hide_deleted ()) message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, - 0, 0); + 0, CAMEL_MESSAGE_DELETED); else message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, 0); |