From: Darko Koruga <darko@users.sourceforge.net>
Date: Wed, 10 Dec 2003 19:44:27 +0000 (+0000)
Subject: Allow reverting to default sort mode (no sort).
X-Git-Tag: rel_0_9_8~26
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=be0df973c059a9ac80ee1080761b942ae0924d62

Allow reverting to default sort mode (no sort).
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ee8da17ff..6501d4f7a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-12-11 [darko]	0.9.7claws34
+
+	* src/summaryview.c
+		allow reverting to default sort mode (no sort)
+
 2003-12-10 [hoa]	0.9.7claws33
 
 	* src/matcher.c
diff --git a/configure.ac b/configure.ac
index ef3a62c5a..ca5b0861f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/summaryview.c b/src/summaryview.c
index 1c806d380..7410445d3 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2163,8 +2163,7 @@ void summary_sort(SummaryView *summaryview,
 		cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
 		break;
 	case SORT_BY_NONE:
-		cmp_func = NULL;
-		return;
+		break;
 	default:
 		return;
 	}
@@ -2172,6 +2171,10 @@ void summary_sort(SummaryView *summaryview,
 	summaryview->sort_key = sort_key;
 	summaryview->sort_type = sort_type;
 
+	/* allow fallback to don't sort */
+	if (summaryview->sort_key == SORT_BY_NONE)
+		return;
+
 	summary_set_column_titles(summaryview);
 	summary_set_menu_sensitive(summaryview);
 	if(cmp_func != NULL) {