fix a brown paper bag bug, and also add some more checks

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9d3dcee57d7e2620d6287e2ed31fe81ce628898d..4676ee2c79456aae8c449cd3631f6b362ffbe94d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-25 [alfons]    0.8.0claws12
+
+       * src/summaryview.c
+               fix a brown paper bag bug, and also add some more
+               checks
+
 2002-07-25 [christoph] 0.8.0claws11
 
        * src/folder.c

diff --git a/configure.in b/configure.in
index d8ce1c152c809b629d06532da8e435b95980ce07..e4f88e8f6c46aa5f2214c8d635863d18d852689a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws11
+EXTRA_VERSION=claws12
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index 937375c098e4504b861ce10ffcb0a0fa4cfcd7cb..1133a33f76593c456a592818d30444307d2f3de3 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1860,10 +1860,11 @@ void summary_sort(SummaryView *summaryview,
                {
                        PrefsFolderItem *prefs = summaryview->folder_item->prefs;
 
-                       if (prefs == NULL) 
-                               cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
-                       else
+                       if (prefs && prefs->enable_simplify_subject
+                       &&  prefs->simplify_subject_regexp && prefs->simplify_subject_regexp[0])
                                cmp_func = (GtkCListCompareFunc)summary_cmp_by_simplified_subject;
+                       else
+                               cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
                }                               
                break;
        case SORT_BY_SCORE:
@@ -4719,7 +4720,7 @@ static gint summary_cmp_by_simplified_subject
        const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
        
        g_return_val_if_fail(sv, -1);
-       g_return_val_if_fail(msginfo1 == NULL || msginfo2 == NULL, -1);
+       g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
        
        str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_SUBJECT]])->text;
        str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_SUBJECT]])->text;