projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use PBKDF2 with HMAC-SHA1 for master passphrase in clawsrc.
[claws.git] / src / prefs_common.c
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 2aa832728fc827dd705dfd8ae7faacfedb5023da..f4acf34c01b679c6ac011c3fbef0fcefc1be1c6a 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 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
@@ -18,7 +18,8 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -59,7 +60,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,
@@ -138,10 +141,6 @@ static PrefParam param_os_specific[] = {
  */
 
 static PrefParam param[] = {
-#ifdef MAEMO
-       {"data_root", "", &prefs_common.data_root, P_STRING,
-        NULL, NULL, NULL},
-#endif
        /* Receive */
        {"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL,
         NULL, NULL, NULL},
@@ -164,14 +163,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,6 +197,8 @@ static PrefParam param[] = {
         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,
+        P_BOOL, NULL, NULL, NULL},
 
        {"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana,
         P_BOOL, NULL, NULL, NULL},
@@ -228,6 +221,8 @@ static PrefParam param[] = {
         &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,
@@ -246,6 +241,8 @@ 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,
@@ -440,16 +437,23 @@ 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_("%d/%m/%y(%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,
@@ -643,6 +647,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},
@@ -652,6 +658,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,
@@ -678,6 +686,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,
@@ -740,6 +750,8 @@ static PrefParam param[] = {
         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},
@@ -830,6 +842,9 @@ static PrefParam param[] = {
 #ifndef G_OS_WIN32
        {"uri_open_command", DEFAULT_BROWSER_CMD,
         &SPECIFIC_PREFS.uri_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},
@@ -1159,6 +1174,28 @@ static PrefParam param[] = {
        {"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}
 };
 
@@ -1252,16 +1289,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;                       \
 } \
 
@@ -1351,9 +1388,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.
@@ -1445,7 +1484,7 @@ void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
 
                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);
        }
 }
@@ -1464,7 +1503,7 @@ void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
 
                pref_get_unescaped_pref(out, txt);
 
-               gtk_entry_set_text(entry, out?out:"");
+               gtk_entry_set_text(entry, out);
                g_free(out);
        }
 }
@@ -1533,15 +1572,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).
Claws Mail