aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c34
2 files changed, 11 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8489dbc10f..e2ffb41ad6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-21 Christopher James Lahey <clahey@ximian.com>
+
+ * Revert fix for Ximian bug #6995.
+
2001-08-23 Peter Williams <peterw@ximian.com>
* mail-folder-cache.c (maybe_update): Record the timeout_id so we
@@ -196,7 +200,7 @@
* mail-callbacks.c (delete_msg): Made delete make the cursor go
backwards if the user is sorting by descending date. Fixes Ximian
- bug #6995.
+ bug #6995. (Reverted.)
2001-08-19 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 12ec4d945f..cf3f43336b 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1601,39 +1601,17 @@ delete_msg (GtkWidget *button, gpointer user_data)
/* Select the next message if we are only deleting one message */
if (deleted) {
- MessageListSelectDirection direction = MESSAGE_LIST_SELECT_NEXT;
- ETableState *state;
-
- state = e_tree_get_state_object (fb->message_list->tree);
- if (e_table_sort_info_grouping_get_count(state->sort_info) == 0 &&
- e_table_sort_info_sorting_get_count(state->sort_info) == 1) {
- ETableSortColumn column;
-
- column = e_table_sort_info_sorting_get_nth (state->sort_info, 0);
- if ((column.column == COL_SENT ||
- column.column == COL_RECEIVED) &&
- column.ascending == FALSE) {
- direction = MESSAGE_LIST_SELECT_PREVIOUS;
- }
- }
- gtk_object_unref (GTK_OBJECT (state));
-
row = e_tree_row_of_node (fb->message_list->tree,
e_tree_get_cursor (fb->message_list->tree));
-
+
/* If this is the last message and deleted messages
are hidden, select the previous */
- if (((direction == MESSAGE_LIST_SELECT_NEXT && (row+1 == e_tree_row_count (fb->message_list->tree))) ||
- (direction == MESSAGE_LIST_SELECT_PREVIOUS && (row == 0)))
- && mail_config_get_hide_deleted ()) {
- if (direction == MESSAGE_LIST_SELECT_NEXT)
- direction = MESSAGE_LIST_SELECT_PREVIOUS;
- else
- direction = MESSAGE_LIST_SELECT_NEXT;
- message_list_select (fb->message_list, row, direction,
+ 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, CAMEL_MESSAGE_DELETED, FALSE);
- } else
- message_list_select (fb->message_list, row, direction,
+ else
+ message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT,
0, 0, FALSE);
}
}