2007-01-16 [paul] 2.7.1cvs7
authorColin Leroy <colin@colino.net>
Tue, 16 Jan 2007 13:08:24 +0000 (13:08 +0000)
committerColin Leroy <colin@colino.net>
Tue, 16 Jan 2007 13:08:24 +0000 (13:08 +0000)
* src/summaryview.c
Allow folder classes to specify only sort_key or
sort_type instead of both or none.

ChangeLog
PATCHSETS
configure.ac
src/summaryview.c

index 9f87650ccd9d47caa905787a0eed7ebf7f1c30a7..6ab12ee8f1d2642f2245d84a7387e38ee405190b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16 [paul]      2.7.1cvs7
+
+       * src/summaryview.c
+               Allow folder classes to specify only sort_key or
+               sort_type instead of both or none.
+
 2007-01-16 [paul]      2.7.1cvs6
 
        * src/action.c
index fc84b2f01d01f0cc180a65eadddaa1019c4666fe..8e37f754932a253d05c6f3c69bc93c0519548129 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.179.2.148 -r 1.179.2.149 src/imap.c;  cvs diff -u -r 1.1.4.69 -r 1.1.4.70 src/etpan/imap-thread.c;  ) > 2.7.1cvs4.patchset
 ( cvs diff -u -r 1.179.2.149 -r 1.179.2.150 src/imap.c;  ) > 2.7.1cvs5.patchset
 ( cvs diff -u -r 1.12.2.41 -r 1.12.2.42 src/action.c;  cvs diff -u -r 1.382.2.351 -r 1.382.2.352 src/compose.c;  cvs diff -u -r 1.83.2.98 -r 1.83.2.99 src/mimeview.c;  cvs diff -u -r 1.49.2.86 -r 1.49.2.87 src/procmime.c;  cvs diff -u -r 1.96.2.164 -r 1.96.2.165 src/textview.c;  ) > 2.7.1cvs6.patchset
+( cvs diff -u -r 1.395.2.276 -r 1.395.2.277 src/summaryview.c;  ) > 2.7.1cvs7.patchset
index ecc46dd0956583f5ab561ac6c562cfa5ff3fe378..c29c2f75ac53e9909a3db8573d8a288d90acd777 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f1f549ad50c5fabeb5d691c0c04cd7a2acd6ac4e..8a88807f0df4aa4e4c73c93a1f5cc79b63194c43 100644 (file)
@@ -6267,13 +6267,14 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
                summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
 
        /* Sorting */
-       if (folder_get_sort_type(item->folder, &sort_key, &sort_type)) {
-               summaryview->sort_key = sort_key;
-               summaryview->sort_type = sort_type;
-       } else {
-               summaryview->sort_key = item->sort_key;
-               summaryview->sort_type = item->sort_type;
-       }
+       sort_key = item->sort_key;
+       sort_type = item->sort_type;
+
+       folder_get_sort_type(item->folder, &sort_key, &sort_type);
+
+       summaryview->sort_key = sort_key;
+       summaryview->sort_type = sort_type;
+
        /* Threading */
        summaryview->threaded = item->threaded;
        summaryview->thread_collapsed = item->thread_collapsed;