*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#include "claws-features.h"
#endif
#include "stock_pixmap.h"
#include "prefswindow.h"
#include "colorlabel.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
#include "addrcustomattr.h"
#endif
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},
{"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,
{"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}
};
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; \
} \
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);