2007-07-03 [colin] 2.10.0cvs4

	* src/folder.c
	* src/mainwindow.c
		Fix saving of sort mode for tags and
		thread date. Thanks to Pierre Ossman.
		Completes fix for bug 1233

diff --git a/ChangeLog b/ChangeLog
index 0e3363ec5b55f7bbfeccc5b06cfbe33caccc64a7..23d1f2674e9025cb58595b12ff78f7254e3f42a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-03 [colin]     2.10.0cvs4
+
+       * src/folder.c
+       * src/mainwindow.c
+               Fix saving of sort mode for tags and
+               thread date. Thanks to Pierre Ossman.
+               Completes fix for bug 1233
+
 2007-07-03 [paul]      2.10.0cvs3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index da072d09a3659888e0c89808895bd4aff9e28b95..5624d007ad73710d9d67ca1b39995dba13b3e408 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2657,3 +2657,4 @@
 ( cvs diff -u -r 1.155.2.65 -r 1.155.2.66 src/Makefile.am;  cvs diff -u -r 1.382.2.391 -r 1.382.2.392 src/compose.c;  diff -u /dev/null src/edittags.c;  diff -u /dev/null src/edittags.h;  cvs diff -u -r 1.60.2.32 -r 1.60.2.33 src/filtering.c;  cvs diff -u -r 1.213.2.145 -r 1.213.2.146 src/folder.c;  cvs diff -u -r 1.87.2.41 -r 1.87.2.42 src/folder.h;  cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/headerview.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/headerview.h;  cvs diff -u -r 1.115.2.155 -r 1.115.2.156 src/main.c;  cvs diff -u -r 1.274.2.191 -r 1.274.2.192 src/mainwindow.c;  cvs diff -u -r 1.39.2.37 -r 1.39.2.38 src/mainwindow.h;  cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/manual.h;  cvs diff -u -r 1.75.2.41 -r 1.75.2.42 src/matcher.c;  cvs diff -u -r 1.39.2.12 -r 1.39.2.13 src/matcher.h;  cvs diff -u -r 1.25.2.28 -r 1.25.2.29 src/matcher_parser_parse.y;  cvs diff -u -r 1.83.2.107 -r 1.83.2.108 src/mimeview.c;  cvs diff -u -r 1.16.2.50 -r 1.16.2.51 src/msgcache.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/msgcache.h;  cvs diff -u -r 1.204.2.137 -r 1.204.2.138 src/prefs_common.c;  cvs diff -u -r 1.103.2.84 -r 1.103.2.85 src/prefs_common.h;  cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.57 -r 1.43.2.58 src/prefs_matcher.c;  cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/prefs_summary_column.c;  cvs diff -u -r 1.150.2.98 -r 1.150.2.99 src/procmsg.c;  cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/procmsg.h;  cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/quote_fmt.c;  cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.32 -r 1.22.2.33 src/quote_fmt_parse.y;  cvs diff -u -r 1.395.2.305 -r 1.395.2.306 src/summaryview.c;  cvs diff -u -r 1.68.2.37 -r 1.68.2.38 src/summaryview.h;  cvs diff -u -r 1.96.2.173 -r 1.96.2.174 src/textview.c;  cvs diff -u -r 1.24.2.13 -r 1.24.2.14 src/common/Makefile.am;  cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/defs.h;  diff -u /dev/null src/common/tags.c;  diff -u /dev/null src/common/tags.h;  cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/quicksearch.h;  ) > 2.10.0cvs1.patchset
 ( cvs diff -u -r 1.87.2.42 -r 1.87.2.43 src/folder.h;  cvs diff -u -r 1.274.2.192 -r 1.274.2.193 src/mainwindow.c;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/procmsg.h;  cvs diff -u -r 1.395.2.306 -r 1.395.2.307 src/summaryview.c;  ) > 2.10.0cvs2.patchset
 ( cvs diff -u -r 1.382.2.392 -r 1.382.2.393 src/compose.c;  cvs diff -u -r 1.395.2.307 -r 1.395.2.308 src/summaryview.c;  ) > 2.10.0cvs3.patchset
+( cvs diff -u -r 1.213.2.146 -r 1.213.2.147 src/folder.c;  cvs diff -u -r 1.274.2.193 -r 1.274.2.194 src/mainwindow.c;  ) > 2.10.0cvs4.patchset

diff --git a/configure.ac b/configure.ac
index f877914f98c2fc8d0079ca1c501316257eabcfab..cf4728aeb5016509e608a8f964afff66a858b1c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index f7dae891e1e471d21410cca13969bc0cc5992236..2221d7863b203ff404b3c4db22486cfcedfb17b5 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -575,6 +575,10 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                                item->sort_key = SORT_BY_TO;
                        else if (!strcmp(attr->value, "locked"))
                                item->sort_key = SORT_BY_LOCKED;
+                       else if (!strcmp(attr->value, "tags"))
+                               item->sort_key = SORT_BY_TAGS;
+                       else if (!strcmp(attr->value, "thread_date"))
+                               item->sort_key = SORT_BY_THREAD_DATE;
                } else if (!strcmp(attr->name, "sort_type")) {
                        if (!strcmp(attr->value, "ascending"))
                                item->sort_type = SORT_ASCENDING;
@@ -606,7 +610,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        static gchar *sort_key_str[] = {"none", "number", "size", "date",
                                        "from", "subject", "score", "label",
                                        "mark", "unread", "mime", "to", 
-                                       "locked"};
+                                       "locked", "tags", "thread_date" };
        XMLTag *tag;
        gchar *value;
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a025a84fdaa06d514bb53e9d2392006f93a16d64..3df9af02eaeb1a5d1e3cd25d64c0409993fee5d3 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -580,10 +580,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Sort/by _From"),           NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _To"),             NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
        {N_("/_View/_Sort/by S_ubject"),        NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
-       {N_("/_View/_Sort/by _color label"),
-                                               NULL, sort_summary_cb, SORT_BY_TAGS, "/View/Sort/by number"},
-       {N_("/_View/_Sort/by tag"),
-                                               NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _color label"),    NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by tag"),             NULL, sort_summary_cb, SORT_BY_TAGS, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _mark"),           NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _status"),         NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"},
        {N_("/_View/_Sort/by a_ttachment"),