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 a0ce72152d2aad125f9dccbdd66ae40909b10581..e1c2df99398319807eba654d10561f034cedaa1f 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -21,6 +21,7 @@
 #define __PREFS_COMMON_H__
 
 #ifdef HAVE_CONFIG_H
+#include "config.h"
 #include "claws-features.h"
 #endif
 
@@ -102,6 +103,14 @@ 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
 {
        /* Receive */
@@ -159,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;
@@ -168,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;
@@ -223,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;
@@ -282,6 +294,7 @@ struct _PrefsCommon
        gint mainwin_height;
        gint mainwin_maximised;
        gint mainwin_fullscreen;
+       gint mainwin_menubar;
 
        gint msgwin_width;
        gint msgwin_height;
@@ -523,6 +536,15 @@ struct _PrefsCommon
        
        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;