Use PBKDF2 with HMAC-SHA1 for master passphrase in clawsrc.

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index b144a1603d50f2e7aad19f4bac268228ceaee7e9..e1c2df99398319807eba654d10561f034cedaa1f 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 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
@@ -21,6 +21,7 @@
 #define __PREFS_COMMON_H__
 
 #ifdef HAVE_CONFIG_H
+#include "config.h"
 #include "claws-features.h"
 #endif
 
@@ -102,11 +103,16 @@ typedef enum
        SHOW_BOTH
 } SummaryFromShow;
 
+typedef enum
+{
+       AVATARS_DISABLE = 0,
+       AVATARS_ENABLE_CAPTURE = 1,
+       AVATARS_ENABLE_RENDER = 2,
+       AVATARS_ENABLE_BOTH = 3
+} EnableAvatars;
+
 struct _PrefsCommon
 {
-#ifdef MAEMO
-       gchar *data_root;
-#endif
        /* Receive */
        gboolean use_extinc;
        gchar *extinc_cmd;
@@ -118,11 +124,6 @@ struct _PrefsCommon
        gboolean newmail_notify_auto;
        gboolean newmail_notify_manu;
        gchar   *newmail_notify_cmd;
-#ifdef MAEMO
-       gboolean maemo_show_led;
-       gboolean maemo_play_sound;
-       gboolean maemo_show_banner;
-#endif
        RecvDialogMode recv_dialog_mode;
        gint receivewin_width;
        gint receivewin_height;
@@ -138,6 +139,7 @@ struct _PrefsCommon
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
        gboolean outgoing_fallback_to_ascii;
+       gboolean warn_empty_subj;
 
        gboolean allow_jisx0201_kana;
 
@@ -157,6 +159,7 @@ struct _PrefsCommon
        gboolean show_ruler;
        gboolean autosave;
        gint autosave_length;
+       gboolean autosave_encrypted;
        gboolean warn_large_insert;
        gint warn_large_insert_size;
        gboolean compose_no_markup;
@@ -165,6 +168,7 @@ struct _PrefsCommon
        gchar *compose_subject_format;
        gchar *compose_body_format;
        gboolean show_compose_margin;
+       gboolean type_any_header;
 
        /* Quote */
        gboolean reply_with_quote;
@@ -174,7 +178,6 @@ struct _PrefsCommon
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
        gboolean redirect_keep_from;
-       gboolean block_cursor;
        gchar *quote_chars;
        
        gboolean enable_aspell;
@@ -229,10 +232,13 @@ struct _PrefsCommon
        gint stripes_color_offset;
        gboolean enable_hscrollbar;
        gboolean bold_unread;
+       gboolean next_on_delete;
        gboolean enable_thread;
        gboolean thread_by_subject;
        gint thread_by_subject_max_age; /*!< Max. age of a thread which was threaded
                                         *   by subject (days) */
+       FolderSortKey default_sort_key;
+       FolderSortType default_sort_type;
 
        gchar *last_opened_folder;
        gboolean goto_last_folder_on_startup;
@@ -288,6 +294,7 @@ struct _PrefsCommon
        gint mainwin_height;
        gint mainwin_maximised;
        gint mainwin_fullscreen;
+       gint mainwin_menubar;
 
        gint msgwin_width;
        gint msgwin_height;
@@ -378,6 +385,8 @@ struct _PrefsCommon
        /* Other */
 #ifndef G_OS_WIN32
        gchar *uri_cmd;
+#else
+       gchar *gtk_theme;
 #endif
        gchar *ext_editor_cmd;
        gboolean cmds_use_system_default;
@@ -524,6 +533,18 @@ struct _PrefsCommon
        gulong diff_added_color;
        gulong diff_deleted_color;
        gulong diff_hunk_color;
+       
+       gboolean folder_search_wildcard;
+       gboolean address_search_wildcard;
+
+       guint enable_avatars;
+
+#ifndef PASSWORD_CRYPTO_OLD
+       gboolean use_master_passphrase;
+       gchar *master_passphrase;
+       gchar *master_passphrase_salt;
+       guint master_passphrase_pbkdf2_rounds;
+#endif
 };
 
 extern PrefsCommon prefs_common;