rework Display/Summaries
[claws.git] / src / prefs_common.c
index 6f4fab10cca05f39bd66d67796706e3be08e1874..a305c729432293dec70bcbc091685d229ac08140 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * 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-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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 "defs.h"
@@ -41,6 +41,7 @@
 #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"
-#include "addrcustomattr.h"
+#include "passwordstore.h"
+#include "file-utils.h"
+
+#ifndef USE_ALT_ADDRBOOK
+       #include "addrcustomattr.h"
+#endif
 
 enum {
        DATEFMT_FMT,
@@ -92,8 +98,6 @@ static PrefParam param_os_specific[] = {
         &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",
@@ -119,6 +123,16 @@ static PrefParam param_os_specific[] = {
        /* 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",
@@ -138,10 +152,9 @@ static PrefParam param_os_specific[] = {
  */
 
 static PrefParam param[] = {
-#ifdef MAEMO
-       {"data_root", "", &prefs_common.data_root, P_STRING,
-        NULL, NULL, NULL},
-#endif
+       {"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},
@@ -150,7 +163,7 @@ static PrefParam param[] = {
 
        {"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},
@@ -164,14 +177,6 @@ static PrefParam param[] = {
        P_BOOL, NULL, NULL, NULL},
        {"newmail_notify_cmd", "", &SPECIFIC_PREFS.newmail_notify_cmd, P_STRING,
         NULL, NULL, NULL},
-#ifdef MAEMO
-       {"maemo_show_led", "TRUE", &prefs_common.maemo_show_led, P_BOOL,
-        NULL, NULL, NULL},
-       {"maemo_play_sound", "FALSE", &prefs_common.maemo_play_sound, P_BOOL,
-        NULL, NULL, NULL},
-       {"maemo_show_banner", "FALSE", &prefs_common.maemo_show_banner, P_BOOL,
-        NULL, NULL, NULL},
-#endif
        {"receive_dialog_mode", "2", &prefs_common.recv_dialog_mode, P_ENUM,
         NULL, NULL, NULL},
        {"receivewin_width", "460", &prefs_common.receivewin_width, P_INT,
@@ -206,7 +211,14 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"outgoing_fallback_to_ascii", "TRUE", &prefs_common.outgoing_fallback_to_ascii, P_BOOL,
         NULL, NULL, NULL},
-
+        {"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},
 
@@ -226,6 +238,11 @@ static PrefParam param[] = {
         &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL},
        {"compose_body_format", N_("Hello,\\n"),
         &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
+       {"show_compose_margin", "FALSE", &prefs_common.show_compose_margin, P_BOOL,
+        NULL, NULL, NULL},
+       {"type_any_header", "FALSE", &prefs_common.type_any_header, P_BOOL,
+        NULL, NULL, NULL},
+       
 
        {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
         NULL, NULL, NULL},
@@ -243,6 +260,12 @@ static PrefParam param[] = {
         P_BOOL, NULL, NULL, NULL},
         {"autosave_length", "50", &prefs_common.autosave_length, P_INT,
         NULL, NULL, NULL},
+        {"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},
+        {"warn_large_insert_size", "500", &prefs_common.warn_large_insert_size,
+        P_INT, NULL, NULL, NULL},
 
        {"enable_aspell", "TRUE", &prefs_common.enable_aspell, P_BOOL,
         NULL, NULL, NULL},
@@ -256,8 +279,8 @@ static PrefParam param[] = {
         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},
 
@@ -306,22 +329,8 @@ static PrefParam param[] = {
         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",
@@ -333,8 +342,6 @@ static PrefParam param[] = {
        {"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",
@@ -433,18 +440,25 @@ 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,
         NULL, NULL, NULL},
-       {"date_format", N_("%y/%m/%d(%a) %H:%M"), &prefs_common.date_format,
+       {"date_format", N_("%x(%a) %H:%M"), &prefs_common.date_format,
         P_STRING, NULL, NULL, NULL},
+       {"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},
@@ -602,6 +616,18 @@ static PrefParam param[] = {
        {"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,
@@ -634,6 +660,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"mainwin_fullscreen", "FALSE", &prefs_common.mainwin_fullscreen, P_BOOL,
         NULL, NULL, NULL},
+       {"mainwin_menubar", "TRUE", &prefs_common.mainwin_menubar, P_BOOL,
+        NULL, NULL, NULL},
 #ifndef GENERIC_UMPC
        {"mainwin_width", "800", &prefs_common.mainwin_width, P_INT,
         NULL, NULL, NULL},
@@ -643,6 +671,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"messagewin_height", "540", &prefs_common.msgwin_height, P_INT,
         NULL, NULL, NULL},
+       {"mimeview_tree_height", "60", &prefs_common.mimeview_tree_height, P_INT,
+        NULL, NULL, NULL},      
        {"sourcewin_width", "600", &prefs_common.sourcewin_width, P_INT,
         NULL, NULL, NULL},
        {"sourcewin_height", "500", &prefs_common.sourcewin_height, P_INT,
@@ -669,6 +699,8 @@ static PrefParam param[] = {
        {"compose_height", "470", &prefs_common.compose_height, P_INT,
         NULL, NULL, NULL},
 #endif
+       {"compose_notebook_height", "130", &prefs_common.compose_notebook_height, P_INT,
+        NULL, NULL, NULL},
        {"compose_x", "0", &prefs_common.compose_x, P_INT,
         NULL, NULL, NULL},
        {"compose_y", "0", &prefs_common.compose_y, P_INT,
@@ -677,31 +709,48 @@ static PrefParam param[] = {
        {"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,
@@ -726,8 +775,13 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"scroll_half_page", "FALSE", &prefs_common.scroll_halfpage, P_BOOL,
         NULL, NULL, NULL},
+       {"hide_quoted", "TRUE",
+        &prefs_common.hide_quoted, P_BOOL,
+        NULL, NULL, NULL},
        {"respect_flowed_format", "FALSE", &prefs_common.respect_flowed_format, P_BOOL,
         NULL, NULL, NULL},
+       {"show_all_headers", "FALSE", &prefs_common.show_all_headers, P_BOOL,
+        NULL, NULL, NULL},
 
        {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
         NULL, NULL, NULL},
@@ -742,8 +796,10 @@ static PrefParam param[] = {
        /* 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},
 
        /* Interface */
 #ifndef GENERIC_UMPC
@@ -755,9 +811,24 @@ static PrefParam param[] = {
 #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,
@@ -778,6 +849,12 @@ static PrefParam param[] = {
         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,
@@ -789,13 +866,31 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"nextunreadmsg_dialog", "1", &prefs_common.next_unread_msg_dialog, P_ENUM,
         NULL, NULL, NULL},
+       {"summary_from_show", "0", &prefs_common.summary_from_show, P_ENUM,
+        NULL, NULL, NULL},
 
        {"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},
@@ -814,12 +909,13 @@ static PrefParam param[] = {
 #ifndef G_OS_WIN32
        {"uri_open_command", DEFAULT_BROWSER_CMD,
         &SPECIFIC_PREFS.uri_cmd, P_STRING, NULL, NULL, NULL},
-       {"print_command", "lpr %s",
-        &SPECIFIC_PREFS.print_cmd, P_STRING, NULL, NULL, NULL},
+#else
+       {"gtk_theme", DEFAULT_W32_GTK_THEME,
+        &SPECIFIC_PREFS.gtk_theme, P_STRING, NULL, NULL, NULL},
 #endif
        {"ext_editor_command", DEFAULT_EDITOR_CMD,
         &SPECIFIC_PREFS.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
-       {"cmds_use_system_default", "FALSE",
+       {"cmds_use_system_default", "TRUE",
         &prefs_common.cmds_use_system_default, P_BOOL, NULL, NULL, NULL},
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, NULL, NULL, NULL},
@@ -880,22 +976,22 @@ static PrefParam param[] = {
        {"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},
@@ -916,11 +1012,11 @@ static PrefParam param[] = {
        {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT,
         NULL, NULL, NULL},
 
-       {"gtk_can_change_accels", "TRUE", &prefs_common.gtk_can_change_accels, P_BOOL,
+       {"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,
-        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,
@@ -943,6 +1039,11 @@ static PrefParam param[] = {
        {"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,
@@ -1021,6 +1122,21 @@ static PrefParam param[] = {
        {"addressbook_folderselwin_height", "-1", &prefs_common.addressbook_folderselwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"aboutwin_width", "450", &prefs_common.aboutwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"aboutwin_height", "500", &prefs_common.aboutwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addrgather_width", "450", &prefs_common.addrgather_width, P_INT,
+        NULL, NULL, NULL},
+       {"addrgather_height", "-1", &prefs_common.addrgather_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"news_subscribe_width", "450", &prefs_common.news_subscribe_width, P_INT,
+        NULL, NULL, NULL},
+       {"news_subscribe_height", "400", &prefs_common.news_subscribe_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -1035,8 +1151,6 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"stripes_color_offset", "4000", &prefs_common.stripes_color_offset, P_INT,
         NULL, NULL, NULL},
-       {"enable_dotted_lines", "FALSE", &prefs_common.enable_dotted_lines, P_BOOL,
-        NULL, NULL, NULL},
        {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
         NULL, NULL, NULL},
        {"folderview_vscrollbar_policy", "0",
@@ -1096,6 +1210,14 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"print_paper_orientation", "0", &prefs_common.print_paper_orientation, P_INT,
         NULL, NULL, NULL},
+       {"print_margin_top", "-1", &prefs_common.print_margin_top, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_bottom", "-1", &prefs_common.print_margin_bottom, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_left", "-1", &prefs_common.print_margin_left, P_INT,
+        NULL, NULL, NULL},
+       {"print_margin_right", "-1", &prefs_common.print_margin_right, P_INT,
+        NULL, NULL, NULL},
        {"print_use_color", "0", &prefs_common.print_use_color, P_INT,
         NULL, NULL, NULL},
        {"print_use_collate", "0", &prefs_common.print_use_collate, P_INT,
@@ -1121,6 +1243,39 @@ static PrefParam param[] = {
        {"inherit_folder_properties", "FALSE", &prefs_common.inherit_folder_props, P_BOOL,
         NULL, NULL, NULL},
 
+       {"flush_metadata", "TRUE", &prefs_common.flush_metadata, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"nav_history_length", "50", &prefs_common.nav_history_length, P_INT,
+        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}
 };
 
@@ -1144,19 +1299,19 @@ GList *prefs_common_read_history_from_dir_with_defaults(const gchar *dirname, co
        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);
 
@@ -1214,16 +1369,16 @@ void prefs_common_read_config(void)
                prefs_common_read_history(MESSAGE_SEARCH_HISTORY);
        prefs_common.compose_save_to_history =
                prefs_common_read_history(COMPOSE_SAVE_TO_HISTORY);
-
+#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;                       \
 } \
 
@@ -1246,18 +1401,18 @@ static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *
        }
        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;
        }
@@ -1272,7 +1427,7 @@ static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *
 
 out:
        if (fp)
-               fclose(fp);
+               claws_safe_fclose(fp);
        g_free(tmp_path);
        g_free(path);
 }
@@ -1313,9 +1468,11 @@ void prefs_common_write_config(void)
        prefs_common_save_history(COMPOSE_SAVE_TO_HISTORY, 
                prefs_common.compose_save_to_history);
 
-       prefs_common_save_history_to_dir(ADDRBOOK_DIR,
+#ifndef USE_ALT_ADDRBOOK
+               prefs_common_save_history_to_dir(ADDRBOOK_DIR,
                ADDRESSBOOK_CUSTOM_ATTRIBUTES, 
                prefs_common.addressbook_custom_attributes);
+#endif
 }
 
 /* make a copy of string 'in' into buffer 'out'. un-escape \ sequences.
@@ -1330,8 +1487,8 @@ void pref_get_unescaped_pref(gchar *out, const gchar *in)
 
        *out = '\0';
 
-       g_return_if_fail( in != NULL );
-       g_return_if_fail( out != NULL );
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
 
        i = in;
        o = out;
@@ -1366,8 +1523,8 @@ void pref_get_escaped_pref(gchar *out, const gchar *in)
 
        *out = '\0';
 
-       g_return_if_fail( in != NULL );
-       g_return_if_fail( out != NULL );
+       cm_return_if_fail( in != NULL );
+       cm_return_if_fail( out != NULL );
 
        i = in;
        o = out;
@@ -1396,18 +1553,18 @@ void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
        GtkTextBuffer *buffer;
        gchar *out = NULL;
 
-       g_return_if_fail( textview != NULL );
+       cm_return_if_fail( textview != NULL );
 
        buffer = gtk_text_view_get_buffer(textview);
 
        if (!txt) {
                gtk_text_buffer_set_text(buffer, "", -1);
        } else {
-               out = malloc(strlen(txt)+1);
+               out = g_malloc(strlen(txt)+1);
 
                pref_get_unescaped_pref(out, txt);
 
-               gtk_text_buffer_set_text(buffer, out?out:"", -1);
+               gtk_text_buffer_set_text(buffer, out, -1);
                g_free(out);
        }
 }
@@ -1418,15 +1575,15 @@ void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
 {
        gchar *out = NULL;
 
-       g_return_if_fail( entry != NULL );
+       cm_return_if_fail( entry != NULL );
        if (!txt) {
                gtk_entry_set_text(entry, "");
        } else {
-               out = malloc(strlen(txt)+1);
+               out = g_malloc(strlen(txt)+1);
 
                pref_get_unescaped_pref(out, txt);
 
-               gtk_entry_set_text(entry, out?out:"");
+               gtk_entry_set_text(entry, out);
                g_free(out);
        }
 }
@@ -1439,15 +1596,15 @@ gchar *pref_get_pref_from_textview(GtkTextView *textview)
        GtkTextIter start, end;
        gchar *out, *tmp;
        
-       g_return_val_if_fail( textview != NULL, "" );
+       cm_return_val_if_fail( textview != NULL, "" );
 
        buffer = gtk_text_view_get_buffer(textview);
        gtk_text_buffer_get_start_iter(buffer, &start);
        gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
        out = malloc(2*strlen(tmp)+1);
-       
-       pref_get_escaped_pref(out, tmp);
+       if (out)
+               pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
        return out?out:"";
@@ -1459,12 +1616,13 @@ gchar *pref_get_pref_from_entry(GtkEntry *entry)
 {
        gchar *out, *tmp;
 
-       g_return_val_if_fail( entry != NULL, "" );
+       cm_return_val_if_fail( entry != NULL, "" );
 
        tmp = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
        out = malloc(2*strlen(tmp)+1);
-
-       pref_get_escaped_pref(out, tmp);
+       
+       if (out)
+               pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
        return out?out:"";
@@ -1494,15 +1652,6 @@ gboolean prefs_common_enable_log_status(void)
        return prefs_common.enable_log_status;
 }
 
-#ifdef MAEMO
-const gchar *prefs_common_get_data_root(void)
-{
-       if (prefs_common.data_root && *prefs_common.data_root)
-               return prefs_common.data_root;
-       else
-               return NULL;
-}
-#endif
 /**
    return the translated name of a header, if the translate_header option is
    set, otherwise return the untranslated header name (header_name itself).
@@ -1563,6 +1712,11 @@ gboolean prefs_common_get_use_shred(void)
        return prefs_common.use_shred;
 }
 
+gboolean prefs_common_get_flush_metadata (void)
+{
+       return prefs_common.flush_metadata;
+}
+
 PrefsCommon *prefs_common_get_prefs(void)
 {
        return &prefs_common;