[Commits] [SCM] claws branch, master, updated. 3.12.0-80-g6d746be

[claws at claws-mail.org]

The branch, master has been updated
       via  6d746bea45f768fcaba27ca9a066105d528ea2db (commit)
       via  952429350434024b69f925a82a7daeeefe2175bd (commit)
      from  0617341d22124f8eea9bc0620773f580768c5610 (commit)

Summary of changes:
 src/folder.c       |    4 ++--
 src/prefs_common.c |    4 ++++
 src/prefs_common.h |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 6d746bea45f768fcaba27ca9a066105d528ea2db
Merge: 9524293 0617341
Author: Paul <paul at claws-mail.org>
Date:   Wed Sep 9 17:02:23 2015 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 952429350434024b69f925a82a7daeeefe2175bd
Author: Paul <paul at claws-mail.org>
Date:   Wed Sep 9 16:54:57 2015 +0100

    add prefs for default folder sort and direction, no ui yet

diff --git a/src/folder.c b/src/folder.c
index 78d7821..16ceae1 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -389,8 +389,8 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
 	item->data = NULL;
 	item->parent_stype = -1;
 
-	item->sort_key = SORT_BY_DATE;
-	item->sort_type = SORT_ASCENDING;
+	item->sort_key = prefs_common.default_sort_key;
+	item->sort_type = prefs_common.default_sort_type;
 
 	item->prefs = folder_item_prefs_new();
 
diff --git a/src/prefs_common.c b/src/prefs_common.c
index eb28b96..029371f 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -437,6 +437,10 @@ static PrefParam param[] = {
 	 NULL, NULL, NULL},
 
 	/* Display: Summary View */
+	{"default_sort_key", "3", &prefs_common.default_sort_key, P_ENUM,
+	 NULL, NULL, NULL},
+	{"default_sort_type", "1", &prefs_common.default_sort_type, P_ENUM,
+	 NULL, NULL, NULL},
 	{"use_address_book", "FALSE", &prefs_common.use_addr_book, P_BOOL,
 	 NULL, NULL, NULL},
 	{"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
diff --git a/src/prefs_common.h b/src/prefs_common.h
index e9686ae..2daf079 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -235,6 +235,8 @@ struct _PrefsCommon
 	gboolean thread_by_subject;
 	gint thread_by_subject_max_age; /*!< Max. age of a thread which was threaded
 					 *   by subject (days) */
+	FolderSortKey default_sort_key;
+	FolderSortType default_sort_type;
 
 	gchar *last_opened_folder;
 	gboolean goto_last_folder_on_startup;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail