/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2020 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#include "claws-features.h"
#endif
#include "prefs_display_header.h"
#include "prefs_summary_column.h"
#include "prefs_folder_column.h"
+#include "prefs_migration.h"
#include "mainwindow.h"
#include "summaryview.h"
#include "folderview.h"
#include "stock_pixmap.h"
#include "prefswindow.h"
#include "colorlabel.h"
-#ifndef USE_NEW_ADDRBOOK
+#include "passwordstore.h"
+#include "file-utils.h"
+
+#ifndef USE_ALT_ADDRBOOK
#include "addrcustomattr.h"
#endif
&prefs_common.newmail_notify_cmd, P_STRING, NULL, NULL, NULL},
/* new fonts */
- {"widget_font_gtk2", NULL,
- &prefs_common.widgetfont, P_STRING, NULL, NULL, NULL},
{"message_font_gtk2", "Monospace 9",
&prefs_common.textfont, P_STRING, NULL, NULL, NULL},
{"print_font_gtk2", "Monospace 9",
/* Interface */
{"pixmap_theme_path", DEFAULT_PIXMAP_THEME,
&prefs_common.pixmap_theme_path, P_STRING, NULL, NULL, NULL},
+#ifdef HAVE_SVG
+ {"enable_alpha_svg", "TRUE",
+ &prefs_common.enable_alpha_svg, P_BOOL, NULL, NULL, NULL},
+ {"enable_pixmap_scaling", "TRUE",
+ &prefs_common.enable_pixmap_scaling, P_BOOL, NULL, NULL, NULL},
+ {"pixmap_scaling_auto", "TRUE",
+ &prefs_common.pixmap_scaling_auto, P_BOOL, NULL, NULL, NULL},
+ {"pixmap_scaling_ppi", "96",
+ &prefs_common.pixmap_scaling_ppi, P_INT, NULL, NULL, NULL},
+#endif
/* Other */
{"ext_editor_command", "notepad %s",
*/
static PrefParam param[] = {
+ {"config_version", "0",
+ &prefs_common.config_version, P_INT, NULL, NULL, NULL},
+
/* Receive */
{"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL,
NULL, NULL, NULL},
{"autochk_newmail", "FALSE", &prefs_common.autochk_newmail, P_BOOL,
NULL, NULL, NULL},
- {"autochk_interval", "10", &prefs_common.autochk_itv, P_INT,
+ {"autochk_interval", "600", &prefs_common.autochk_itv, P_INT,
NULL, NULL, NULL},
{"check_on_startup", "FALSE", &prefs_common.chk_on_startup, P_BOOL,
NULL, NULL, NULL},
NULL, NULL, NULL},
{"outgoing_fallback_to_ascii", "TRUE", &prefs_common.outgoing_fallback_to_ascii, P_BOOL,
NULL, NULL, NULL},
- {"warn_empty_subj", "TRUE", &prefs_common.warn_empty_subj,
+ {"rewrite_first_from", "TRUE", &prefs_common.rewrite_first_from,
+ P_BOOL, NULL, NULL, NULL},
+ {"warn_empty_subj", "TRUE", &prefs_common.warn_empty_subj,
+ P_BOOL, NULL, NULL, NULL},
+ {"warn_sending_many_recipients_num", "0", &prefs_common.warn_sending_many_recipients_num, P_INT,
+ NULL, NULL, NULL},
+ {"hide_timezone", "FALSE", &prefs_common.hide_timezone,
P_BOOL, NULL, NULL, NULL},
-
{"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana,
P_BOOL, NULL, NULL, NULL},
P_BOOL, NULL, NULL, NULL},
{"autosave_length", "50", &prefs_common.autosave_length, P_INT,
NULL, NULL, NULL},
- {"autosave_encrypted", "TRUE", &prefs_common.autosave_encrypted,
+ {"autosave_encrypted", "FALSE", &prefs_common.autosave_encrypted,
P_BOOL, NULL, NULL, NULL},
{"warn_large_insert", "TRUE", &prefs_common.warn_large_insert,
P_BOOL, NULL, NULL, NULL},
NULL, NULL, NULL},
{"recheck_when_changing_dict", "TRUE", &prefs_common.recheck_when_changing_dict,
P_BOOL, NULL, NULL, NULL},
- {"misspelled_color", "#ff0000", &prefs_common.misspelled_col, P_COLOR,
- NULL, NULL, NULL},
+ {"misspelled_color", "#ff0000", &prefs_common.color[COL_MISSPELLED],
+ P_COLOR, NULL, NULL, NULL},
{"use_both_dicts", "FALSE", &prefs_common.use_both_dicts, P_BOOL,
NULL, NULL, NULL},
NULL, NULL, NULL},
/* Display */
- /* Obsolete fonts. For coexisting with Gtk+-1.2 version */
- {"widget_font", NULL,
- &prefs_common.widgetfont_gtk1, P_STRING, NULL, NULL, NULL},
- {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
- &prefs_common.textfont_gtk1, P_STRING, NULL, NULL, NULL},
- {"small_font", "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
- &prefs_common.smallfont_gtk1, P_STRING, NULL, NULL, NULL},
- {"bold_font", "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
- &prefs_common.boldfont_gtk1, P_STRING, NULL, NULL, NULL},
- {"normal_font", "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
- &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL},
-
- /* new fonts */
+ /* fonts */
#ifndef GENERIC_UMPC
- {"widget_font_gtk2", NULL,
- &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL},
{"message_font_gtk2", "Monospace 9",
&SPECIFIC_PREFS.textfont, P_STRING, NULL, NULL, NULL},
{"print_font_gtk2", "Monospace 9",
{"bold_font_gtk2", "Sans Bold 9",
&SPECIFIC_PREFS.boldfont, P_STRING, NULL, NULL, NULL},
#else
- {"widget_font_gtk2", NULL,
- &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL},
{"message_font_gtk2", "Monospace 8",
&SPECIFIC_PREFS.textfont, P_STRING, NULL, NULL, NULL},
{"print_font_gtk2", "Monospace 8",
&prefs_common.ng_abbrev_len, P_INT,
NULL, NULL, NULL},
+#ifdef ENABLE_NLS
+ {"translate_header", "TRUE", &prefs_common.trans_hdr, P_BOOL,
+ NULL, NULL, NULL},
+#else
{"translate_header", "FALSE", &prefs_common.trans_hdr, P_BOOL,
NULL, NULL, NULL},
+#endif
/* Display: Summary View */
{"default_sort_key", "3", &prefs_common.default_sort_key, P_ENUM,
{"msgview_date_format", "FALSE", &prefs_common.msgview_date_format, P_BOOL,
NULL, NULL, NULL},
- {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
+ {"next_on_delete", "FALSE", &prefs_common.next_on_delete, P_BOOL,
NULL, NULL, NULL},
- {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
+ {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
NULL, NULL, NULL},
+
#ifndef GENERIC_UMPC
{"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
NULL, NULL, NULL},
{"summary_col_show_tags", "FALSE",
&prefs_common.summary_col_visible[S_COL_TAGS], P_BOOL, NULL, NULL, NULL},
- {"summary_col_pos_mark", "0",
+ {"summary_col_lock", "FALSE", &prefs_common.summary_col_lock, P_BOOL,
+ NULL, NULL, NULL},
+
+ {"summary_col_pos_mark", "0",
&prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
{"summary_col_pos_unread", "1",
&prefs_common.summary_col_pos[S_COL_STATUS], P_INT, NULL, NULL, NULL},
{"folder_col_size_total", "32",
&prefs_common.folder_col_size[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
#endif
+
+ {"folder_default_thread", "TRUE", &prefs_common.folder_default_thread, P_BOOL,
+ NULL, NULL, NULL},
+ {"folder_default_thread_collapsed", "FALSE", &prefs_common.folder_default_thread_collapsed, P_BOOL,
+ NULL, NULL, NULL},
+ {"folder_default_hide_read_threads", "FALSE", &prefs_common.folder_default_hide_read_threads, P_BOOL,
+ NULL, NULL, NULL},
+ {"folder_default_hide_read_msgs", "FALSE", &prefs_common.folder_default_hide_read_msgs, P_BOOL,
+ NULL, NULL, NULL},
+ {"folder_default_hide_del_msgs", "FALSE", &prefs_common.folder_default_hide_del_msgs, P_BOOL,
+ NULL, NULL, NULL},
+
{"summaryview_width", "500", &prefs_common.summaryview_width, P_INT,
NULL, NULL, NULL},
{"summaryview_height", "244", &prefs_common.summaryview_height, P_INT,
{"enable_color", "TRUE", &prefs_common.enable_color, P_BOOL,
NULL, NULL, NULL},
- {"quote_level1_color", "#0000b3", &prefs_common.quote_level1_col, P_COLOR,
- NULL, NULL, NULL},
- {"quote_level2_color", "#0000b3", &prefs_common.quote_level2_col, P_COLOR,
- NULL, NULL, NULL},
- {"quote_level3_color", "#0000b3", &prefs_common.quote_level3_col, P_COLOR,
- NULL, NULL, NULL},
+ {"quote_level1_color", "#0000b3", &prefs_common.color[COL_QUOTE_LEVEL1],
+ P_COLOR, NULL, NULL, NULL},
+ {"quote_level2_color", "#0000b3", &prefs_common.color[COL_QUOTE_LEVEL2],
+ P_COLOR, NULL, NULL, NULL},
+ {"quote_level3_color", "#0000b3", &prefs_common.color[COL_QUOTE_LEVEL3],
+ P_COLOR, NULL, NULL, NULL},
{"enable_bgcolor", "FALSE", &prefs_common.enable_bgcolor, P_BOOL,
NULL, NULL, NULL},
- {"quote_level1_bgcolor", "#cccccc", &prefs_common.quote_level1_bgcol, P_COLOR,
- NULL, NULL, NULL},
- {"quote_level2_bgcolor", "#d4d4d4", &prefs_common.quote_level2_bgcol, P_COLOR,
- NULL, NULL, NULL},
- {"quote_level3_bgcolor", "#dddddd", &prefs_common.quote_level3_bgcol, P_COLOR,
- NULL, NULL, NULL},
- {"uri_color", "#007f00", &prefs_common.uri_col, P_COLOR,
- NULL, NULL, NULL},
- {"emphasis_color", "#0000cf", &prefs_common.emphasis_col, P_COLOR,
- NULL, NULL, NULL},
- {"target_folder_color", "#da1cca", &prefs_common.tgt_folder_col, P_COLOR,
- NULL, NULL, NULL},
- {"signature_color", "#797979", &prefs_common.signature_col, P_COLOR,
- NULL, NULL, NULL},
+ {"quote_level1_bgcolor", "#cccccc", &prefs_common.color[COL_QUOTE_LEVEL1_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"quote_level2_bgcolor", "#d4d4d4", &prefs_common.color[COL_QUOTE_LEVEL2_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"quote_level3_bgcolor", "#dddddd", &prefs_common.color[COL_QUOTE_LEVEL3_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"uri_color", "#007f00", &prefs_common.color[COL_URI],
+ P_COLOR, NULL, NULL, NULL},
+ {"emphasis_color", "#0000cf", &prefs_common.color[COL_EMPHASIS],
+ P_COLOR, NULL, NULL, NULL},
+ {"target_folder_color", "#da1cca", &prefs_common.color[COL_TGT_FOLDER],
+ P_COLOR, NULL, NULL, NULL},
+ {"signature_color", "#797979", &prefs_common.color[COL_SIGNATURE],
+ P_COLOR, NULL, NULL, NULL},
{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
P_BOOL, NULL, NULL, NULL},
+ {"default_header_color", "#000000", &prefs_common.color[COL_DEFAULT_HEADER],
+ P_COLOR, NULL, NULL, NULL},
+ {"default_header_bgcolor", "#f5f6be", &prefs_common.color[COL_DEFAULT_HEADER_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"tags_color", "#000000", &prefs_common.color[COL_TAGS],
+ P_COLOR, NULL, NULL, NULL},
+ {"tags_bgcolor", "#f5f6be", &prefs_common.color[COL_TAGS_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"qs_active_color", "#000000", &prefs_common.color[COL_QS_ACTIVE],
+ P_COLOR, NULL, NULL, NULL},
+ {"qs_active_bgcolor", "#f5f6be", &prefs_common.color[COL_QS_ACTIVE_BG],
+ P_COLOR, NULL, NULL, NULL},
+ {"qs_error_color", "#000000", &prefs_common.color[COL_QS_ERROR],
+ P_COLOR, NULL, NULL, NULL},
+ {"qs_error_bgcolor", "#ff7070", &prefs_common.color[COL_QS_ERROR_BG],
+ P_COLOR, NULL, NULL, NULL},
+
{"display_header_pane", "FALSE", &prefs_common.display_header_pane,
P_BOOL, NULL, NULL, NULL},
{"display_header", "TRUE", &prefs_common.display_header, P_BOOL,
NULL, NULL, NULL},
{"display_xface", "TRUE", &prefs_common.display_xface,
P_BOOL, NULL, NULL, NULL},
+ {"save_xface", "TRUE", &prefs_common.save_xface,
+ P_BOOL, NULL, NULL, NULL},
{"render_html", "TRUE", &prefs_common.render_html, P_BOOL,
NULL, NULL, NULL},
{"invoke_plugin_on_html", "FALSE", &prefs_common.invoke_plugin_on_html, P_BOOL,
/* MIME viewer */
{"mime_textviewer", NULL,
&SPECIFIC_PREFS.mime_textviewer, P_STRING, NULL, NULL, NULL},
- {"mime_open_command", "gedit '%s'",
+ {"mime_open_command", "xdg-open '%s'",
&SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL},
{"show_inline_attachments", "TRUE",
&prefs_common.show_inline_attachments, P_BOOL, NULL, NULL, NULL},
#endif
/* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
NULL, NULL, NULL}, */
- {"always_show_message_when_selected", "0",
+ {"open_selected_message_on_folder_open", "FALSE",
+ &prefs_common.open_selected_on_folder_open,
+ P_BOOL, NULL, NULL, NULL},
+ {"open_selected_message_on_search_results", "FALSE",
+ &prefs_common.open_selected_on_search_results,
+ P_BOOL, NULL, NULL, NULL},
+ {"open_selected_message_on_prevnext", "FALSE",
+ &prefs_common.open_selected_on_prevnext,
+ P_BOOL, NULL, NULL, NULL},
+ {"open_selected_message_on_deletemove", "FALSE",
+ &prefs_common.open_selected_on_deletemove,
+ P_BOOL, NULL, NULL, NULL},
+ {"open_selected_message_on_directional", "FALSE",
+ &prefs_common.open_selected_on_directional,
+ P_BOOL, NULL, NULL, NULL},
+ {"always_show_message_when_selected", "FALSE",
&prefs_common.always_show_msg,
- P_ENUM, NULL, NULL, NULL},
+ P_BOOL, NULL, NULL, NULL},
{"select_on_entry", "3", &prefs_common.select_on_entry,
P_ENUM, NULL, NULL, NULL},
{"show_tooltips", "TRUE", &prefs_common.show_tooltips,
NULL, NULL, NULL},
{"summary_select_prio7", "0", &prefs_common.summary_select_prio[6], P_ENUM,
NULL, NULL, NULL},
+ {"summary_select_prio8", "0", &prefs_common.summary_select_prio[7], P_ENUM,
+ NULL, NULL, NULL},
+ {"summary_select_prio9", "0", &prefs_common.summary_select_prio[8], P_ENUM,
+ NULL, NULL, NULL},
+ {"summary_select_prio10", "0", &prefs_common.summary_select_prio[9], P_ENUM,
+ NULL, NULL, NULL},
{"mark_as_read_on_new_window", "FALSE",
&prefs_common.mark_as_read_on_new_window,
{"pixmap_theme_path", DEFAULT_PIXMAP_THEME,
&SPECIFIC_PREFS.pixmap_theme_path, P_STRING,
NULL, NULL, NULL},
+#ifdef HAVE_SVG
+ {"enable_alpha_svg", "TRUE",
+ &SPECIFIC_PREFS.enable_alpha_svg, P_BOOL,
+ NULL, NULL, NULL},
+ {"enable_pixmap_scaling", "TRUE",
+ &SPECIFIC_PREFS.enable_pixmap_scaling, P_BOOL,
+ NULL, NULL, NULL},
+ {"pixmap_scaling_auto", "TRUE",
+ &SPECIFIC_PREFS.pixmap_scaling_auto, P_BOOL,
+ NULL, NULL, NULL},
+ {"pixmap_scaling_ppi", "96",
+ &SPECIFIC_PREFS.pixmap_scaling_ppi, P_INT,
+ NULL, NULL, NULL},
+#endif
{"ask_mark_all_read", "TRUE", &prefs_common.ask_mark_all_read, P_BOOL,
NULL, NULL, NULL},
+ {"ask_override_colorlabel", "TRUE", &prefs_common.ask_override_colorlabel, P_BOOL,
+ NULL, NULL, NULL},
{"ask_apply_per_account_filtering_rules", "TRUE", &prefs_common.ask_apply_per_account_filtering_rules, P_BOOL,
NULL, NULL, NULL},
{"enable_log_status", "FALSE", &prefs_common.enable_log_status, P_BOOL,
NULL, NULL, NULL},
#endif
- {"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_error_color", "#af0000", &prefs_common.log_error_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_in_color", "#000000", &prefs_common.log_in_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_out_color", "#0000ef", &prefs_common.log_out_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_status_ok_color", "#00af00", &prefs_common.log_status_ok_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_status_nok_color", "#0000af", &prefs_common.log_status_nok_color, P_COLOR,
- NULL, NULL, NULL},
- {"log_status_skip_color", "#aa00aa", &prefs_common.log_status_skip_color, P_COLOR,
- NULL, NULL, NULL},
+ {"log_msg_color", "#00af00", &prefs_common.color[COL_LOG_MSG],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_warn_color", "#af0000", &prefs_common.color[COL_LOG_WARN],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_error_color", "#af0000", &prefs_common.color[COL_LOG_ERROR],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_in_color", "#000000", &prefs_common.color[COL_LOG_IN],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_out_color", "#0000ef", &prefs_common.color[COL_LOG_OUT],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_status_ok_color", "#00af00", &prefs_common.color[COL_LOG_STATUS_OK],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_status_nok_color", "#0000af", &prefs_common.color[COL_LOG_STATUS_NOK],
+ P_COLOR, NULL, NULL, NULL},
+ {"log_status_skip_color", "#aa00aa", &prefs_common.color[COL_LOG_STATUS_SKIP],
+ P_COLOR, NULL, NULL, NULL},
{"enable_filtering_debug", "FALSE", &prefs_common.enable_filtering_debug, P_BOOL,
NULL, NULL, NULL},
{"gtk_can_change_accels", "FALSE", &prefs_common.gtk_can_change_accels, P_BOOL,
NULL, NULL, NULL},
-
- {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,
+ {"gtk_enable_accels", "TRUE", &prefs_common.gtk_enable_accels, P_BOOL,
NULL, NULL, NULL},
+ {"color_new", "#0000b3", &prefs_common.color[COL_NEW],
+ P_COLOR, NULL, NULL, NULL},
+
/* Some windows' sizes */
{"filteringwin_width", "500", &prefs_common.filteringwin_width, P_INT,
NULL, NULL, NULL},
{"templateswin_height", "-1", &prefs_common.templateswin_height, P_INT,
NULL, NULL, NULL},
+ {"actionsiodialog_width", "582", &prefs_common.actionsiodialog_width, P_INT,
+ NULL, NULL, NULL},
+ {"actionsiodialog_height", "310", &prefs_common.actionsiodialog_height, P_INT,
+ NULL, NULL, NULL},
+
{"actionswin_width", "486", &prefs_common.actionswin_width, P_INT,
NULL, NULL, NULL},
{"actionswin_height", "-1", &prefs_common.actionswin_height, P_INT,
NULL, NULL, NULL},
- {"tagswin_width", "486", &prefs_common.tagswin_width, P_INT,
+ {"tagswin_width", "586", &prefs_common.tagswin_width, P_INT,
NULL, NULL, NULL},
{"tagswin_height", "-1", &prefs_common.tagswin_height, P_INT,
NULL, NULL, NULL},
+ {"sslmanwin_width", "486", &prefs_common.sslmanwin_width, P_INT,
+ NULL, NULL, NULL},
+ {"sslmanwin_height", "-1", &prefs_common.sslmanwin_height, P_INT,
+ NULL, NULL, NULL},
+
+ {"uriopenerwin_width", "-1", &prefs_common.uriopenerwin_width, P_INT,
+ NULL, NULL, NULL},
+ {"uriopenerwin_height", "-1", &prefs_common.uriopenerwin_height, P_INT,
+ NULL, NULL, NULL},
+
+ {"foldersortwin_width", "400", &prefs_common.foldersortwin_width, P_INT,
+ NULL, NULL, NULL},
+ {"foldersortwin_height", "300", &prefs_common.foldersortwin_height, P_INT,
+ NULL, NULL, NULL},
+
{"addressbookwin_width", "520", &prefs_common.addressbookwin_width, P_INT,
NULL, NULL, NULL},
{"addressbookwin_height", "-1", &prefs_common.addressbookwin_height, P_INT,
NULL, NULL, NULL},
/* Hidden */
+ {"imap_scan_tree_recurs_limit", "64", &prefs_common.imap_scan_tree_recurs_limit, P_INT,
+ NULL, NULL, NULL},
{"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
NULL, NULL, NULL},
{"utf8_instead_of_locale_for_broken_mail", "0",
{"nav_history_length", "50", &prefs_common.nav_history_length, P_INT,
NULL, NULL, NULL},
- {"diff_added_color", "#008b8b", &prefs_common.diff_added_color, P_COLOR,
- NULL, NULL, NULL},
- {"diff_deleted_color", "#6a5acd", &prefs_common.diff_deleted_color, P_COLOR,
- NULL, NULL, NULL},
- {"diff_hunk_color", "#a52a2a", &prefs_common.diff_hunk_color, P_COLOR,
- NULL, NULL, NULL},
+ {"diff_added_color", "#008b8b", &prefs_common.color[COL_DIFF_ADDED],
+ P_COLOR, NULL, NULL, NULL},
+ {"diff_deleted_color", "#6a5acd", &prefs_common.color[COL_DIFF_DELETED],
+ P_COLOR, NULL, NULL, NULL},
+ {"diff_hunk_color", "#a52a2a", &prefs_common.color[COL_DIFF_HUNK],
+ P_COLOR, NULL, NULL, NULL},
{"folder_search_wildcard", "TRUE", &prefs_common.folder_search_wildcard, P_BOOL,
NULL, NULL, NULL},
{"address_search_wildcard", "TRUE", &prefs_common.address_search_wildcard, P_BOOL,
NULL, NULL, NULL},
{"enable_avatars", "3", &prefs_common.enable_avatars, P_INT, NULL, NULL, NULL},
+#ifndef PASSWORD_CRYPTO_OLD
+ {"use_master_passphrase", FALSE, &prefs_common.use_master_passphrase, P_BOOL, NULL, NULL, NULL },
+ {"master_passphrase", "", &prefs_common.master_passphrase, P_STRING, NULL, NULL, NULL },
+ {"master_passphrase_salt", "", &prefs_common.master_passphrase_salt, P_STRING, NULL, NULL, NULL },
+ {"master_passphrase_pbkdf2_rounds", "50000", &prefs_common.master_passphrase_pbkdf2_rounds, P_INT, NULL, NULL, NULL},
+#endif
+
+ {"use_proxy", "FALSE", &prefs_common.use_proxy, P_BOOL, NULL, NULL, NULL},
+ {"proxy_type", "1", &prefs_common.proxy_info.proxy_type, P_ENUM, NULL, NULL, NULL},
+ {"proxy_host", "localhost", &prefs_common.proxy_info.proxy_host, P_STRING, NULL, NULL, NULL},
+ {"proxy_port", "1080", &prefs_common.proxy_info.proxy_port, P_USHORT, NULL, NULL, NULL},
+ {"use_proxy_auth", "FALSE", &prefs_common.proxy_info.use_proxy_auth, P_BOOL, NULL, NULL, NULL},
+ {"proxy_name", "", &prefs_common.proxy_info.proxy_name, P_STRING, NULL, NULL, NULL},
+ {"proxy_pass", NULL, &prefs_common.proxy_info.proxy_pass, P_STRING, NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, history,
NULL);
}
- if ((fp = g_fopen(path, "rb")) == NULL) {
- if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+ if ((fp = claws_fopen(path, "rb")) == NULL) {
+ if (ENOENT != errno) FILE_OP_ERROR(path, "claws_fopen");
g_free(path);
/* returns default list if set, otherwise NULL */
return default_list;
}
g_free(path);
- while (fgets(buf, sizeof(buf), fp) != NULL) {
+ while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
g_strstrip(buf);
if (buf[0] == '\0') continue;
tmp = add_history(tmp, buf);
}
- fclose(fp);
+ claws_fclose(fp);
tmp = g_list_reverse(tmp);
prefs_common_read_history(MESSAGE_SEARCH_HISTORY);
prefs_common.compose_save_to_history =
prefs_common_read_history(COMPOSE_SAVE_TO_HISTORY);
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
prefs_common.addressbook_custom_attributes = addressbook_update_custom_attr_from_prefs();
#endif
colorlabel_update_colortable_from_prefs();
#define TRY(func) \
if (!(func)) \
{ \
- g_warning("failed to write\n"); \
+ g_warning("failed to write"); \
goto out; \
} \
}
tmp_path = g_strconcat(path, ".tmp", NULL);
- if ((fp = g_fopen(tmp_path, "wb")) == NULL) {
- FILE_OP_ERROR(tmp_path, "fopen");
+ if ((fp = claws_fopen(tmp_path, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp_path, "claws_fopen");
goto out;
}
for (cur = list; cur != NULL; cur = cur->next) {
- TRY(fputs((gchar *)cur->data, fp) != EOF &&
- fputc('\n', fp) != EOF);
+ TRY(claws_fputs((gchar *)cur->data, fp) != EOF &&
+ claws_fputc('\n', fp) != EOF);
}
- if (fclose(fp) == EOF) {
- FILE_OP_ERROR(tmp_path, "fclose");
+ if (claws_safe_fclose(fp) == EOF) {
+ FILE_OP_ERROR(tmp_path, "claws_fclose");
fp = NULL;
goto out;
}
out:
if (fp)
- fclose(fp);
+ claws_safe_fclose(fp);
g_free(tmp_path);
g_free(path);
}
prefs_common_save_history(COMPOSE_SAVE_TO_HISTORY,
prefs_common.compose_save_to_history);
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
prefs_common_save_history_to_dir(ADDRBOOK_DIR,
ADDRESSBOOK_CUSTOM_ATTRIBUTES,
prefs_common.addressbook_custom_attributes);
projects / claws.git / blobdiff