Remove obsolete font prefs
[claws.git] / src / prefs_common.c
index 70749b77e1da27da2722ce799e07a839dbf22e74..7be13c4bae1e95ec8ea28a2513a875cfb4f2040a 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"
@@ -59,7 +59,9 @@
 #include "stock_pixmap.h"
 #include "prefswindow.h"
 #include "colorlabel.h"
-#include "addrcustomattr.h"
+#ifndef USE_ALT_ADDRBOOK
+       #include "addrcustomattr.h"
+#endif
 
 enum {
        DATEFMT_FMT,
@@ -121,10 +123,6 @@ static PrefParam param_os_specific[] = {
         &prefs_common.pixmap_theme_path, P_STRING, NULL, NULL, NULL},
 
        /* Other */
-       {"uri_open_command", NULL,
-        &prefs_common.uri_cmd, P_STRING, NULL, NULL, NULL},
-       {"print_command", "notepad /p %s",
-        &prefs_common.print_cmd, P_STRING, NULL, NULL, NULL},
        {"ext_editor_command", "notepad %s",
         &prefs_common.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
 
@@ -142,10 +140,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},
@@ -154,7 +151,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},
@@ -168,14 +165,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,
@@ -192,7 +181,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"confirm_send_queued_messages", "FALSE", &prefs_common.confirm_send_queued_messages,
         P_BOOL, NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"send_dialog_mode", "0", &prefs_common.send_dialog_invisible, P_BOOL,
         NULL, NULL, NULL},
 #else
@@ -208,7 +197,18 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
         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", "FALSE", &prefs_common.warn_sending_many_recipients,
+        P_BOOL, NULL, NULL, NULL},
+       {"warn_sending_many_recipients_num", "1", &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},
 
@@ -228,6 +228,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},
@@ -235,34 +240,40 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"linewrap_pastes", "TRUE", &prefs_common.linewrap_pastes, P_BOOL,
         NULL, NULL, NULL},
+       {"primary_paste_unselects", "FALSE", &prefs_common.primary_paste_unselects, P_BOOL,
+        NULL, NULL, NULL},
        {"linewrap_auto", "TRUE", &prefs_common.autowrap, P_BOOL,
         NULL, NULL, NULL},
+       {"auto_indent", "TRUE", &prefs_common.auto_indent, P_BOOL,
+        NULL, NULL, NULL},
         {"autosave", "TRUE", &prefs_common.autosave,
         P_BOOL, NULL, NULL, NULL},
         {"autosave_length", "50", &prefs_common.autosave_length, P_INT,
         NULL, NULL, NULL},
-#if USE_ASPELL
+        {"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},
-       {"aspell_path", ASPELL_PATH, &prefs_common.aspell_path, P_STRING,
-        NULL, NULL, NULL},
        {"dictionary",  "", &prefs_common.dictionary, P_STRING,
         NULL, NULL, NULL},
        {"alt_dictionary",  "", &prefs_common.alt_dictionary, P_STRING,
         NULL, NULL, NULL},
-       {"aspell_sugmode", "1", &prefs_common.aspell_sugmode, P_INT,
-        NULL, NULL, NULL},
        {"use_alternate_dict", "FALSE", &prefs_common.use_alternate, P_BOOL,
         NULL, NULL, NULL},
        {"check_while_typing", "TRUE", &prefs_common.check_while_typing, P_BOOL,
         NULL, NULL, NULL},
        {"recheck_when_changing_dict", "TRUE", &prefs_common.recheck_when_changing_dict,
         P_BOOL, NULL, NULL, NULL},
-       {"misspelled_color", "16711680", &prefs_common.misspelled_col, P_COLOR,
+       {"misspelled_color", "#ff0000", &prefs_common.misspelled_col, P_COLOR,
         NULL, NULL, NULL},
        {"use_both_dicts", "FALSE", &prefs_common.use_both_dicts, P_BOOL,
         NULL, NULL, NULL},
-#endif
+
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
         NULL, NULL, NULL},
        {"compose_dnd_insert_or_attach", "0", &prefs_common.compose_dnd_mode, P_ENUM,
@@ -282,7 +293,7 @@ static PrefParam param[] = {
        {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
         NULL, NULL, NULL},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
 #else
@@ -293,34 +304,23 @@ static PrefParam param[] = {
        /* Quote */
        {"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
         NULL, NULL, NULL},
-       {"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q"),
+       {"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q\\n%X"),
         &prefs_common.quotefmt, P_STRING, NULL, NULL, NULL},
 
        {"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
         NULL, NULL, NULL},
        {"forward_quote_format",
         N_("\\n\\nBegin forwarded message:\\n\\n"
-        "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
-        "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"),
-        &prefs_common.fw_quotefmt, P_STRING, NULL, NULL, NULL},
+        "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
+        "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"),
+        &prefs_common.fw_quotefmt, P_STRING,
+        NULL, NULL, NULL},
        {"quote_chars", ">", &prefs_common.quote_chars, P_STRING,
         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 */
-#ifndef MAEMO
+       /* fonts */
+#ifndef GENERIC_UMPC
        {"widget_font_gtk2",    NULL,
          &SPECIFIC_PREFS.widgetfont,           P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
@@ -434,19 +434,28 @@ 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},
+
+        {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
         NULL, NULL, NULL},
 
        {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
         NULL, NULL, NULL},
 #else
@@ -457,7 +466,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"show_col_headers", "TRUE", &prefs_common.show_col_headers, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
        {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
@@ -525,7 +534,7 @@ static PrefParam param[] = {
         &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_size_mime", "10",
         &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"summary_col_size_subject", "200",
         &prefs_common.summary_col_size[S_COL_SUBJECT], P_INT, NULL, NULL, NULL},
        {"summary_col_size_from", "120",
@@ -584,7 +593,7 @@ static PrefParam param[] = {
        {"folder_col_pos_total", "3",
         &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
 
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"folder_col_size_folder", "120",
         &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
        {"folder_col_size_new", "32",
@@ -633,7 +642,11 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"mainwin_maximised", "FALSE", &prefs_common.mainwin_maximised, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+       {"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},
        {"mainwin_height", "600", &prefs_common.mainwin_height, P_INT,
@@ -642,6 +655,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,
@@ -668,6 +683,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,
@@ -676,31 +693,48 @@ static PrefParam param[] = {
        {"enable_color", "TRUE", &prefs_common.enable_color, P_BOOL,
         NULL, NULL, NULL},
 
-       {"quote_level1_color", "179", &prefs_common.quote_level1_col, P_COLOR,
+       {"quote_level1_color", "#0000b3", &prefs_common.quote_level1_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level2_color", "179", &prefs_common.quote_level2_col, P_COLOR,
+       {"quote_level2_color", "#0000b3", &prefs_common.quote_level2_col, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
+       {"quote_level3_color", "#0000b3", &prefs_common.quote_level3_col, P_COLOR,
         NULL, NULL, NULL},
        {"enable_bgcolor", "FALSE", &prefs_common.enable_bgcolor, P_BOOL,
         NULL, NULL, NULL},
-       {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
+       {"quote_level1_bgcolor", "#cccccc", &prefs_common.quote_level1_bgcol, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level2_bgcolor", "13948116", &prefs_common.quote_level2_bgcol, P_COLOR,
+       {"quote_level2_bgcolor", "#d4d4d4", &prefs_common.quote_level2_bgcol, P_COLOR,
         NULL, NULL, NULL},
-       {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
+       {"quote_level3_bgcolor", "#dddddd", &prefs_common.quote_level3_bgcol, P_COLOR,
         NULL, NULL, NULL},
-       {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
+       {"uri_color", "#007f00", &prefs_common.uri_col, P_COLOR,
         NULL, NULL, NULL},
-       {"emphasis_color", "207", &prefs_common.emphasis_col, P_COLOR,
+       {"emphasis_color", "#0000cf", &prefs_common.emphasis_col, P_COLOR,
         NULL, NULL, NULL},
-       {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
+       {"target_folder_color", "#da1cca", &prefs_common.tgt_folder_col, P_COLOR,
         NULL, NULL, NULL},
-       {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR,
+       {"signature_color", "#797979", &prefs_common.signature_col, 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.default_header_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"default_header_bgcolor", "#f5f6be", &prefs_common.default_header_bgcolor, P_COLOR,
+        NULL, NULL, NULL},
+       {"tags_color", "#000000", &prefs_common.tags_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"tags_bgcolor", "#f5f6be", &prefs_common.tags_bgcolor, P_COLOR,
+        NULL, NULL, NULL},
+       {"qs_active_color", "#000000", &prefs_common.qs_active_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"qs_active_bgcolor", "#f5f6be", &prefs_common.qs_active_bgcolor, P_COLOR,
+        NULL, NULL, NULL},
+       {"qs_error_color", "#000000", &prefs_common.qs_error_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"qs_error_bgcolor", "#ff7070", &prefs_common.qs_error_bgcolor, 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,
@@ -711,6 +745,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"invoke_plugin_on_html", "FALSE", &prefs_common.invoke_plugin_on_html, P_BOOL,
         NULL, NULL, NULL},
+       {"promote_html_part", "FALSE", &prefs_common.promote_html_part, P_BOOL,
+        NULL, NULL, NULL},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         NULL, NULL, NULL},
        {"never_send_retrcpt", "FALSE", &prefs_common.never_send_retrcpt, P_BOOL,
@@ -723,8 +759,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},
@@ -741,9 +782,11 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.mime_textviewer,   P_STRING, NULL, NULL, NULL},
        {"mime_open_command", "gedit '%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 MAEMO
+#ifndef GENERIC_UMPC
        {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
         NULL, NULL, NULL},
 #else
@@ -752,9 +795,12 @@ static PrefParam param[] = {
 #endif
        /* {"emulate_emacs", "FALSE", &prefs_common.emulate_emacs, P_BOOL,
         NULL, NULL, NULL}, */
-       {"always_show_message_when_selected", "FALSE",
-        &prefs_common.always_show_msg,
+       {"open_selected_message_on_folder_open", "FALSE",
+        &prefs_common.open_selected_on_folder_open,
         P_BOOL, NULL, NULL, NULL},
+       {"always_show_message_when_selected", "0",
+        &prefs_common.always_show_msg,
+        P_ENUM, NULL, NULL, NULL},
        {"select_on_entry", "3", &prefs_common.select_on_entry,
         P_ENUM, NULL, NULL, NULL},
        {"show_tooltips", "TRUE", &prefs_common.show_tooltips,
@@ -786,6 +832,8 @@ 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,
@@ -808,16 +856,21 @@ static PrefParam param[] = {
         P_INT, NULL, NULL, NULL},
 
        /* Other */
+#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},
+       {"session_passwords", "FALSE", &prefs_common.session_passwords,
+        P_BOOL, NULL, NULL, NULL},
        {"confirm_on_exit", "FALSE", &prefs_common.confirm_on_exit, P_BOOL,
         NULL, NULL, NULL},
        {"clean_trash_on_exit", "FALSE", &prefs_common.clean_on_exit, P_BOOL,
@@ -830,7 +883,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"summary_quicksearch_recurse", "1", &prefs_common.summary_quicksearch_recurse, P_INT,
         NULL, NULL, NULL},
 #else
@@ -838,8 +891,13 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
 #endif
 
+#if defined(__OpenBSD__)
+       {"io_timeout_secs", "80", &prefs_common.io_timeout_secs,
+        P_INT, NULL, NULL, NULL},
+#else
        {"io_timeout_secs", "60", &prefs_common.io_timeout_secs,
         P_INT, NULL, NULL, NULL},
+#endif
        {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},
        {"important_score", "1", &prefs_common.important_score, P_INT,
@@ -849,7 +907,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
         NULL, NULL, NULL},
        {"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
@@ -904,10 +962,10 @@ 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", "179", &prefs_common.color_new, P_COLOR,
+       {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},
 
        /* Some windows' sizes */
@@ -1009,6 +1067,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},
@@ -1023,8 +1096,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",
@@ -1035,7 +1106,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"cache_max_mem_usage", "4096", &prefs_common.cache_max_mem_usage, P_INT,
         NULL, NULL, NULL},
        {"cache_min_keep_time", "15", &prefs_common.cache_min_keep_time, P_INT,
@@ -1072,7 +1143,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"unsafe_ssl_certs", "FALSE", &prefs_common.unsafe_ssl_certs, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        {"real_time_sync", "FALSE", &prefs_common.real_time_sync, P_BOOL,
         NULL, NULL, NULL},
 #else
@@ -1084,6 +1155,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,
@@ -1100,6 +1179,39 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"use_networkmanager", "TRUE", &prefs_common.use_networkmanager, P_BOOL,
         NULL, NULL, NULL},
+       {"use_shred", "FALSE", &prefs_common.use_shred, P_BOOL,
+        NULL, NULL, NULL},
+
+       {"two_line_vertical", "TRUE", &prefs_common.two_line_vert,
+       P_BOOL, NULL, NULL, NULL },
+
+       {"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.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},
+
+       {"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
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -1172,22 +1284,10 @@ void prefs_common_read_config(void)
 
        g_free(rcpath);
 
-       tmp = g_strdup(gettext(prefs_common.quotefmt));
-       g_free(prefs_common.quotefmt);
-       prefs_common.quotefmt = tmp;
-
-       tmp = g_strdup(gettext(prefs_common.fw_quotefmt));
-       g_free(prefs_common.fw_quotefmt);
-       prefs_common.fw_quotefmt = tmp;
-       
        tmp = g_strdup(gettext(prefs_common.date_format));
        g_free(prefs_common.date_format);
        prefs_common.date_format = tmp;
 
-       tmp = g_strdup(gettext(prefs_common.compose_body_format));
-       g_free(prefs_common.compose_body_format);
-       prefs_common.compose_body_format = tmp;
-
        prefs_common.mime_open_cmd_history =
                prefs_common_read_history(COMMAND_HISTORY);
        prefs_common.summary_quicksearch_history =
@@ -1204,16 +1304,18 @@ void prefs_common_read_config(void)
                prefs_common_read_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY);
        prefs_common.message_search_history =
                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;                       \
 } \
 
@@ -1253,7 +1355,7 @@ static void prefs_common_save_history_to_dir(const gchar *dirname, const gchar *
        }
        fp = NULL;
 #ifdef G_OS_WIN32
-       g_unlink(path);
+       claws_unlink(path);
 #endif
        if (g_rename(tmp_path, path) < 0) {
                FILE_OP_ERROR(path, "rename");
@@ -1300,10 +1402,14 @@ void prefs_common_write_config(void)
                prefs_common.summary_search_adv_condition_history);
        prefs_common_save_history(MESSAGE_SEARCH_HISTORY, 
                prefs_common.message_search_history);
+       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.
@@ -1318,8 +1424,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;
@@ -1354,8 +1460,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;
@@ -1384,18 +1490,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);
        }
 }
@@ -1406,15 +1512,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);
        }
 }
@@ -1427,15 +1533,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:"";
@@ -1447,12 +1553,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:"";
@@ -1482,15 +1589,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).
@@ -1510,6 +1608,9 @@ const gchar *prefs_common_translated_header_name(const gchar *header_name)
 
 const gchar *prefs_common_get_uri_cmd(void)
 {
+#ifdef G_OS_WIN32
+       return NULL;
+#else
        gchar *tmp = NULL;
        
        if (!prefs_common.cmds_use_system_default)
@@ -1521,6 +1622,7 @@ const gchar *prefs_common_get_uri_cmd(void)
        
        g_free(tmp);
        return "xdg-open %s";
+#endif
 }
 
 const gchar *prefs_common_get_ext_editor_cmd(void)
@@ -1541,3 +1643,18 @@ const gchar *prefs_common_get_ext_editor_cmd(void)
        return "xdg-open %s";
 #endif 
 }
+
+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;
+}