talons

commit 7fbc8356e3b6b097b5b0d0d3f6b3f257a18fdb9b
parent cb8a2cde4548c62a3ad8052cb6305caa4dcbb8dd
Author: Paul <paul@claws-mail.org>
Date:   Sat,  5 Jul 2014 07:57:15 +0100

don't switch from 'Thread Date' to 'Date' when clicking column header

When sorting by Thread Date, make clicking the Date columm header not switch to sorting by
Date, but remain sorting by Thread Date, just toggling between ascending/desending, and
maintaining the previous behaviour when sorting by Date.

Diffstat:
M
src/summaryview.c
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -2807,7 +2807,9 @@ static void summary_set_column_titles(SummaryView *summaryview)
 			gtk_box_pack_start(GTK_BOX(hbox), label,
 					   FALSE, FALSE, 0);
 
-		if (summaryview->sort_key == sort_by[type]) {
+		if (summaryview->sort_key == sort_by[type] ||
+		    (summaryview->sort_key == SORT_BY_THREAD_DATE &&
+		     sort_by[SORT_BY_DATE])) {
 			arrow = gtk_arrow_new
 				(summaryview->sort_type == SORT_ASCENDING
 				 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
@@ -7107,7 +7109,10 @@ static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 
 static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-	summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+	if (summaryview->sort_key == SORT_BY_DATE)
+		summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+	else
+		summary_sort_by_column_click(summaryview, SORT_BY_THREAD_DATE);
 }
 
 static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)