Allow reverting to default sort mode (no sort).

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ee8da17ff4fc2a54592e5f1bee6aef7bd46ab446..6501d4f7a45d36cd6e71e1cdb719a37671f59cfe 100644 (file)
--- 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
 2003-12-10 [hoa]       0.9.7claws33
 
        * src/matcher.c

diff --git a/configure.ac b/configure.ac
index ef3a62c5a4dbdc0706c64ad218b51e00fa7fc641..ca5b0861fac5fc03fd919444a05e5937f694c1cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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 1c806d38009f026286d6ff3d3a7884d92cc00fd6..7410445d3142c1e4ad058e9d919dd34d790803c6 100644 (file)
--- 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 = (GtkCListCompareFunc)summary_cmp_by_locked;
                break;
        case SORT_BY_NONE:

-               cmp_func = NULL;
-               return;
+               break;

        default:
                return;
        }
        default:
                return;
        }


@@ -2172,6 +2171,10 @@ void summary_sort(SummaryView *summaryview,
        summaryview->sort_key = sort_key;
        summaryview->sort_type = sort_type;
 
        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) {
        summary_set_column_titles(summaryview);
        summary_set_menu_sensitive(summaryview);
        if(cmp_func != NULL) {