/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
*/
-/* alfons - all folder item specific settings should migrate into
- * folderlist.xml!!! the old folderitemrc file will only serve for a few
- * versions (for compatibility) */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
#include "prefs_gtk.h"
#include "filtering.h"
#include "folder_item_prefs.h"
+#include "prefs_migration.h"
FolderItemPrefs tmp_prefs;
static PrefParam param[] = {
- {"sort_by_number", "FALSE", &tmp_prefs.sort_by_number, P_BOOL,
+ {"enable_default_from", "", &tmp_prefs.enable_default_from, P_BOOL,
NULL, NULL, NULL},
- {"sort_by_size", "FALSE", &tmp_prefs.sort_by_size, P_BOOL,
+ {"default_from", "", &tmp_prefs.default_from, P_STRING,
NULL, NULL, NULL},
- {"sort_by_date", "FALSE", &tmp_prefs.sort_by_date, P_BOOL,
+ {"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
NULL, NULL, NULL},
- {"sort_by_from", "FALSE", &tmp_prefs.sort_by_from, P_BOOL,
+ {"default_to", "", &tmp_prefs.default_to, P_STRING,
NULL, NULL, NULL},
- {"sort_by_subject", "FALSE", &tmp_prefs.sort_by_subject, P_BOOL,
+ {"enable_default_reply_to", "", &tmp_prefs.enable_default_reply_to, P_BOOL,
NULL, NULL, NULL},
- {"sort_by_score", "FALSE", &tmp_prefs.sort_by_score, P_BOOL,
+ {"default_reply_to", "", &tmp_prefs.default_reply_to, P_STRING,
NULL, NULL, NULL},
- {"sort_descending", "FALSE", &tmp_prefs.sort_descending, P_BOOL,
+ {"enable_default_cc", "", &tmp_prefs.enable_default_cc, P_BOOL,
NULL, NULL, NULL},
- /* MIGRATION */
- {"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
+ {"default_cc", "", &tmp_prefs.default_cc, P_STRING,
NULL, NULL, NULL},
- {"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
+ {"enable_default_bcc", "", &tmp_prefs.enable_default_bcc, P_BOOL,
NULL, NULL, NULL},
- {"default_to", "", &tmp_prefs.default_to, P_STRING,
+ {"default_bcc", "", &tmp_prefs.default_bcc, P_STRING,
NULL, NULL, NULL},
- {"enable_default_reply_to", "", &tmp_prefs.enable_default_reply_to, P_BOOL,
+ {"enable_default_replyto", "", &tmp_prefs.enable_default_replyto, P_BOOL,
NULL, NULL, NULL},
- {"default_reply_to", "", &tmp_prefs.default_reply_to, P_STRING,
+ {"default_replyto", "", &tmp_prefs.default_replyto, P_STRING,
NULL, NULL, NULL},
{"enable_simplify_subject", "", &tmp_prefs.enable_simplify_subject, P_BOOL,
NULL, NULL, NULL},
NULL, NULL, NULL},
{"default_account", NULL, &tmp_prefs.default_account, P_INT,
NULL, NULL, NULL},
-#if USE_ASPELL
+#if USE_ENCHANT
{"enable_default_dictionary", "", &tmp_prefs.enable_default_dictionary, P_BOOL,
NULL, NULL, NULL},
{"default_dictionary", NULL, &tmp_prefs.default_dictionary, P_STRING,
{"default_alt_dictionary", NULL, &tmp_prefs.default_alt_dictionary, P_STRING,
NULL, NULL, NULL},
#endif
+ {"always_sign", "0", &tmp_prefs.always_sign, P_ENUM,
+ NULL, NULL, NULL},
+ {"always_encrypt", "0", &tmp_prefs.always_encrypt, P_ENUM,
+ NULL, NULL, NULL},
{"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
NULL, NULL, NULL},
- {"folder_color", "", &tmp_prefs.color, P_INT,
+ {"folder_color", "#000000", &tmp_prefs.color, P_COLOR,
NULL, NULL, NULL},
{"enable_processing", "FALSE", &tmp_prefs.enable_processing, P_BOOL,
NULL, NULL, NULL},
+ {"enable_processing_when_opening", "TRUE", &tmp_prefs.enable_processing_when_opening, P_BOOL,
+ NULL, NULL, NULL},
{"newmailcheck", "TRUE", &tmp_prefs.newmailcheck, P_BOOL,
NULL, NULL, NULL},
{"offlinesync", "FALSE", &tmp_prefs.offlinesync, P_BOOL,
NULL, NULL, NULL},
+ {"offlinesync_days", "0", &tmp_prefs.offlinesync_days, P_INT,
+ NULL, NULL, NULL},
+ {"remove_old_bodies", "FALSE", &tmp_prefs.remove_old_bodies, P_BOOL,
+ NULL, NULL, NULL},
+ {"promote_html_part", "0", &tmp_prefs.promote_html_part, P_ENUM,
+ NULL, NULL, NULL},
+ {"skip_on_goto_unread_or_new", "FALSE", &tmp_prefs.skip_on_goto_unread_or_new, P_BOOL,
+ NULL, NULL, NULL},
{"compose_with_format", "FALSE", &tmp_prefs.compose_with_format, P_BOOL,
NULL, NULL, NULL},
+ {"compose_override_from_format", NULL, &tmp_prefs.compose_override_from_format, P_STRING,
+ NULL, NULL, NULL},
{"compose_subject_format", NULL, &tmp_prefs.compose_subject_format, P_STRING,
NULL, NULL, NULL},
{"compose_body_format", NULL, &tmp_prefs.compose_body_format, P_STRING,
NULL, NULL, NULL},
{"reply_with_format", "FALSE", &tmp_prefs.reply_with_format, P_BOOL,
NULL, NULL, NULL},
+ {"reply_override_from_format", NULL, &tmp_prefs.reply_override_from_format, P_STRING,
+ NULL, NULL, NULL},
{"reply_quotemark", NULL, &tmp_prefs.reply_quotemark, P_STRING,
NULL, NULL, NULL},
{"reply_body_format", NULL, &tmp_prefs.reply_body_format, P_STRING,
NULL, NULL, NULL},
{"forward_with_format", "FALSE", &tmp_prefs.forward_with_format, P_BOOL,
NULL, NULL, NULL},
+ {"forward_override_from_format", NULL, &tmp_prefs.forward_override_from_format, P_STRING,
+ NULL, NULL, NULL},
{"forward_quotemark", NULL, &tmp_prefs.forward_quotemark, P_STRING,
NULL, NULL, NULL},
{"forward_body_format", NULL, &tmp_prefs.forward_body_format, P_STRING,
NULL, NULL, NULL},
+ {"config_version", "-1", &tmp_prefs.config_version, P_INT,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
*item->prefs = tmp_prefs;
- /*
- * MIGRATION: next lines are migration code. the idea is that
- * if used regularly, claws folder config ends up
- * in the same file as sylpheed-main
- */
-
- item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
-
- /* MIGRATION: 0.7.8main+ has persistent sort order. claws had the sort
- * order in different members, which is ofcourse a little
- * bit phoney. */
- if (item->sort_key == SORT_BY_NONE) {
- item->sort_key = (tmp_prefs.sort_by_number ? SORT_BY_NUMBER :
- tmp_prefs.sort_by_size ? SORT_BY_SIZE :
- tmp_prefs.sort_by_date ? SORT_BY_DATE :
- tmp_prefs.sort_by_from ? SORT_BY_FROM :
- tmp_prefs.sort_by_subject ? SORT_BY_SUBJECT :
- tmp_prefs.sort_by_score ? SORT_BY_SCORE :
- SORT_BY_NONE);
- item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
- }
+ prefs_update_config_version_folder_item(item);
}
void folder_item_prefs_save_config(FolderItem * item)
tmp_prefs = * item->prefs;
id = folder_item_get_identifier(item);
+ if (id == NULL)
+ return;
+ debug_print("saving prefs for %s\n", id);
prefs_write_config(param, id, FOLDERITEM_RC);
g_free(id);
+}
- /* MIGRATION: make sure migrated items are not saved
- */
+static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)
+{
+ FolderItem *item = (FolderItem *) node->data;
+ folder_item_prefs_save_config(item);
+ return FALSE;
+}
+
+void folder_item_prefs_save_config_recursive(FolderItem * item)
+{
+ g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+ -1, folder_item_prefs_save_config_func, NULL);
+}
+
+void folder_prefs_save_config_recursive(Folder *folder)
+{
+ g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+ -1, folder_item_prefs_save_config_func, NULL);
}
static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
{
- prefs->sort_by_number = FALSE;
- prefs->sort_by_size = FALSE;
- prefs->sort_by_date = FALSE;
- prefs->sort_by_from = FALSE;
- prefs->sort_by_subject = FALSE;
- prefs->sort_by_score = FALSE;
- prefs->sort_descending = FALSE;
-
- prefs->request_return_receipt = FALSE;
+ prefs->enable_default_from = FALSE;
+ prefs->default_from = NULL;
prefs->enable_default_to = FALSE;
prefs->default_to = NULL;
prefs->enable_default_reply_to = FALSE;
prefs->default_reply_to = NULL;
+ prefs->enable_default_cc = FALSE;
+ prefs->default_cc = NULL;
+ prefs->enable_default_bcc = FALSE;
+ prefs->default_bcc = NULL;
+ prefs->enable_default_replyto = FALSE;
+ prefs->default_replyto = NULL;
prefs->enable_simplify_subject = FALSE;
prefs->simplify_subject_regexp = NULL;
prefs->enable_folder_chmod = FALSE;
prefs->folder_chmod = 0;
prefs->enable_default_account = FALSE;
prefs->default_account = 0;
-#if USE_ASPELL
+#if USE_ENCHANT
prefs->enable_default_dictionary = FALSE;
prefs->default_dictionary = NULL;
prefs->enable_default_alt_dictionary = FALSE;
prefs->default_alt_dictionary = NULL;
#endif
+ prefs->always_sign = SIGN_OR_ENCRYPT_DEFAULT;
+ prefs->always_encrypt = SIGN_OR_ENCRYPT_DEFAULT;
prefs->save_copy_to_folder = FALSE;
prefs->color = 0;
- prefs->enable_processing = TRUE;
+ prefs->enable_processing = FALSE;
+ prefs->enable_processing_when_opening = FALSE;
prefs->processing = NULL;
prefs->newmailcheck = TRUE;
prefs->offlinesync = FALSE;
+ prefs->offlinesync_days = 0;
+ prefs->remove_old_bodies = FALSE;
+ prefs->promote_html_part = HTML_PROMOTE_DEFAULT;
+ prefs->skip_on_goto_unread_or_new = FALSE;
prefs->compose_with_format = FALSE;
prefs->compose_subject_format = NULL;
prefs->compose_body_format = NULL;
+ prefs->compose_override_from_format = NULL;
prefs->reply_with_format = FALSE;
prefs->reply_quotemark = NULL;
prefs->reply_body_format = NULL;
+ prefs->reply_override_from_format = NULL;
prefs->forward_with_format = FALSE;
prefs->forward_quotemark = NULL;
prefs->forward_body_format = NULL;
-
+ prefs->forward_override_from_format = NULL;
return prefs;
}
void folder_item_prefs_free(FolderItemPrefs * prefs)
{
+ g_free(prefs->default_from);
g_free(prefs->default_to);
g_free(prefs->default_reply_to);
+ g_free(prefs->default_cc);
+ g_free(prefs->default_bcc);
+ g_free(prefs->default_replyto);
g_free(prefs->compose_subject_format);
g_free(prefs->compose_body_format);
+ g_free(prefs->compose_override_from_format);
g_free(prefs->reply_quotemark);
g_free(prefs->reply_body_format);
+ g_free(prefs->reply_override_from_format);
g_free(prefs->forward_quotemark);
g_free(prefs->forward_body_format);
+ g_free(prefs->forward_override_from_format);
g_free(prefs);
}
folder_item_prefs_read_config(src);
tmp_prefs.directory = g_strdup(src->prefs->directory);
- tmp_prefs.sort_by_number = src->prefs->sort_by_number;
- tmp_prefs.sort_by_size = src->prefs->sort_by_size;
- tmp_prefs.sort_by_date = src->prefs->sort_by_date;
- tmp_prefs.sort_by_from = src->prefs->sort_by_from;
- tmp_prefs.sort_by_subject = src->prefs->sort_by_subject;
- tmp_prefs.sort_by_score = src->prefs->sort_by_score;
- tmp_prefs.sort_descending = src->prefs->sort_descending;
- tmp_prefs.enable_thread = src->prefs->enable_thread;
tmp_prefs.enable_processing = src->prefs->enable_processing;
+ tmp_prefs.enable_processing_when_opening = src->prefs->enable_processing_when_opening;
tmp_prefs.newmailcheck = src->prefs->newmailcheck;
- tmp_prefs.offlinesync = src->prefs->offlinesync;
+ tmp_prefs.offlinesync = src->prefs->offlinesync;
+ tmp_prefs.offlinesync_days = src->prefs->offlinesync_days;
+ tmp_prefs.remove_old_bodies = src->prefs->remove_old_bodies;
+ tmp_prefs.promote_html_part = src->prefs->promote_html_part;
+ tmp_prefs.skip_on_goto_unread_or_new = src->prefs->skip_on_goto_unread_or_new;
prefs_matcher_read_config();
tmp_prefs.processing = tmp_prop_list;
tmp_prefs.request_return_receipt = src->prefs->request_return_receipt;
+ tmp_prefs.enable_default_from = src->prefs->enable_default_from;
+ tmp_prefs.default_from = g_strdup(src->prefs->default_from);
tmp_prefs.enable_default_to = src->prefs->enable_default_to;
tmp_prefs.default_to = g_strdup(src->prefs->default_to);
tmp_prefs.enable_default_reply_to = src->prefs->enable_default_reply_to;
tmp_prefs.default_reply_to = g_strdup(src->prefs->default_reply_to);
+ tmp_prefs.enable_default_cc = src->prefs->enable_default_cc;
+ tmp_prefs.default_cc = g_strdup(src->prefs->default_cc);
+ tmp_prefs.enable_default_bcc = src->prefs->enable_default_bcc;
+ tmp_prefs.default_bcc = g_strdup(src->prefs->default_bcc);
+ tmp_prefs.enable_default_replyto = src->prefs->enable_default_replyto;
+ tmp_prefs.default_replyto = g_strdup(src->prefs->default_replyto);
tmp_prefs.enable_simplify_subject = src->prefs->enable_simplify_subject;
tmp_prefs.simplify_subject_regexp = g_strdup(src->prefs->simplify_subject_regexp);
tmp_prefs.enable_folder_chmod = src->prefs->enable_folder_chmod;
tmp_prefs.folder_chmod = src->prefs->folder_chmod;
tmp_prefs.enable_default_account = src->prefs->enable_default_account;
tmp_prefs.default_account = src->prefs->default_account;
-#if USE_ASPELL
+#if USE_ENCHANT
tmp_prefs.enable_default_dictionary = src->prefs->enable_default_dictionary;
tmp_prefs.default_dictionary = g_strdup(src->prefs->default_dictionary);
tmp_prefs.enable_default_alt_dictionary = src->prefs->enable_default_alt_dictionary;
tmp_prefs.default_alt_dictionary = g_strdup(src->prefs->default_alt_dictionary);
#endif
+ tmp_prefs.always_sign = src->prefs->always_sign;
+ tmp_prefs.always_encrypt = src->prefs->always_encrypt;
tmp_prefs.save_copy_to_folder = src->prefs->save_copy_to_folder;
tmp_prefs.color = src->prefs->color;
tmp_prefs.compose_with_format = src->prefs->compose_with_format;
tmp_prefs.compose_subject_format = g_strdup(src->prefs->compose_subject_format);
tmp_prefs.compose_body_format = g_strdup(src->prefs->compose_body_format);
+ tmp_prefs.compose_override_from_format = g_strdup(src->prefs->compose_override_from_format);
tmp_prefs.reply_with_format = src->prefs->reply_with_format;
tmp_prefs.reply_quotemark = g_strdup(src->prefs->reply_quotemark);
tmp_prefs.reply_body_format = g_strdup(src->prefs->reply_body_format);
+ tmp_prefs.reply_override_from_format = g_strdup(src->prefs->reply_override_from_format);
tmp_prefs.forward_with_format = src->prefs->forward_with_format;
tmp_prefs.forward_quotemark = g_strdup(src->prefs->forward_quotemark);
tmp_prefs.forward_body_format = g_strdup(src->prefs->forward_body_format);
+ tmp_prefs.forward_override_from_format = g_strdup(src->prefs->forward_override_from_format);
*dest->prefs = tmp_prefs;
folder_item_prefs_save_config(dest);
+ prefs_matcher_write_config();
+
+ dest->collapsed = src->collapsed;
+ dest->thread_collapsed = src->thread_collapsed;
+ dest->threaded = src->threaded;
+ dest->ret_rcpt = src->ret_rcpt;
+ dest->hide_read_msgs = src->hide_read_msgs;
+ dest->hide_del_msgs = src->hide_del_msgs;
+ dest->hide_read_threads = src->hide_read_threads;
+ dest->sort_key = src->sort_key;
+ dest->sort_type = src->sort_type;
}
projects / claws.git / blobdiff