2006-10-04 [colin] 2.5.2cvs42

	* src/folder.c
	* src/folder.h
	* src/summaryview.c
		Provide a way for folder classes to set their sort
		type and key

diff --git a/ChangeLog b/ChangeLog
index ece641efca34f38288e2ec76fa683da75b5bf503..d8a7878af7a57c109b2b20933fc95beda7504b5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-04 [colin]     2.5.2cvs42
+
+       * src/folder.c
+       * src/folder.h
+       * src/summaryview.c
+               Provide a way for folder classes to set their sort
+               type and key
+
 2006-10-03 [colin]     2.5.2cvs41
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index fb49922018c1d16ae176d1774c48a449488e1ff5..f9ce796bd9235b81e434813972fb0537ed7e783f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1955,3 +1955,4 @@
 ( cvs diff -u -r 1.60.2.21 -r 1.60.2.22 src/filtering.c;  cvs diff -u -r 1.213.2.119 -r 1.213.2.120 src/folder.c;  cvs diff -u -r 1.149.2.59 -r 1.149.2.60 src/inc.c;  cvs diff -u -r 1.28.2.28 -r 1.28.2.29 src/mbox.c;  ) > 2.5.2cvs39.patchset
 ( cvs diff -u -r 1.79.2.47 -r 1.79.2.48 src/mh.c;  ) > 2.5.2cvs40.patchset
 ( cvs diff -u -r 1.79.2.48 -r 1.79.2.49 src/mh.c;  ) > 2.5.2cvs41.patchset
+( cvs diff -u -r 1.213.2.120 -r 1.213.2.121 src/folder.c;  cvs diff -u -r 1.87.2.30 -r 1.87.2.31 src/folder.h;  cvs diff -u -r 1.395.2.261 -r 1.395.2.262 src/summaryview.c;  ) > 2.5.2cvs42.patchset

diff --git a/configure.ac b/configure.ac
index 43059377d874d5de164c4757f8947dcc4e55440e..cba13973446b99c1bf176ef15831e66e10d76dd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 6165a85bc70baa10fbe6e51dfa83ac1af3f72595..ac0dc906e9b89d50e544ce2f92ec7890a9b34d36 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -4012,4 +4012,17 @@ gboolean folder_subscribe (const gchar *uri)
        return FALSE;
 
 }
+
+gboolean folder_get_sort_type          (Folder         *folder,
+                                        FolderSortKey  *sort_key,
+                                        FolderSortType *sort_type)
+{
+       if (!folder || !sort_key || !sort_type)
+               return FALSE;
+       if (folder->klass->get_sort_type == NULL)
+               return FALSE;
+       folder->klass->get_sort_type(folder, sort_key, sort_type); 
+       return TRUE;
+}
+
 #undef PUT_ESCAPE_STR

diff --git a/src/folder.h b/src/folder.h
index a49223b94bf25f55f4b815b38dcd9506ed35a524..a349e9a16864375ced6f99026138e0a0ae7cd7c1 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -576,6 +576,9 @@ struct _FolderClass
        void            (*synchronise)          (FolderItem     *item);
        gboolean        (*subscribe)            (Folder         *folder,
                                                 const gchar    *uri);
+       void            (*get_sort_type)        (Folder         *folder,
+                                                FolderSortKey  *sort_key,
+                                                FolderSortType *sort_type);
 };
 
 struct _FolderItem
@@ -827,5 +830,8 @@ gboolean folder_have_mailbox                (void);
 gboolean folder_item_free_cache                (FolderItem *item, gboolean force);
 void folder_item_change_type           (FolderItem *item,
                                         SpecialFolderItemType newtype);
+gboolean folder_get_sort_type          (Folder         *folder,
+                                        FolderSortKey  *sort_key,
+                                        FolderSortType *sort_type);
 
 #endif /* __FOLDER_H__ */

diff --git a/src/summaryview.c b/src/summaryview.c
index 852078e2c08d362af5af85ba6bceec8ce2253945..9c4d4548d22add50fee172176f6f1652f129dbd9 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -6216,6 +6216,8 @@ static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
 
 void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
 {
+       FolderSortKey sort_key;
+       FolderSortType sort_type;
        g_return_if_fail(summaryview != NULL);
        g_return_if_fail(item != NULL);
 
@@ -6230,9 +6232,13 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
                summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
 
        /* Sorting */
-       summaryview->sort_key = item->sort_key;
-       summaryview->sort_type = item->sort_type;
-
+       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;
+       }
        /* Threading */
        summaryview->threaded = item->threaded;
        summaryview->thread_collapsed = item->thread_collapsed;