Simplify hidden prefs for too many recipients

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 8a38e42d5e118f3864bbf165b2c1b529129eb313..f4b6e1d4b8129e584bbdc4df4c7de70958ac915a 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-2013 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifndef __PREFS_COMMON_H__
@@ -36,6 +35,8 @@
 #include "prefs_msg_colors.h"
 #include "prefs_summary_open.h"
 
+#define CLAWS_CONFIG_VERSION 2
+
 typedef struct _PrefsCommon    PrefsCommon;
 
 typedef enum {
@@ -91,8 +92,8 @@ typedef enum
 
 typedef enum
 {
-       OPENMSG_REQUEST_ONLY = 0,
-       OPENMSG_ALWAYS = 1,
+       OPENMSG_NO = 0,
+       OPENMSG_YES = 1,
        OPENMSG_WHEN_VIEW_VISIBLE
 } ShowMsgPolicy;
 
@@ -113,6 +114,8 @@ typedef enum
 
 struct _PrefsCommon
 {
+       gint config_version;
+
        /* Receive */
        gboolean use_extinc;
        gchar *extinc_cmd;
@@ -139,8 +142,10 @@ struct _PrefsCommon
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
        gboolean outgoing_fallback_to_ascii;
+       gboolean rewrite_first_from;
        gboolean warn_empty_subj;
-
+       gint warn_sending_many_recipients_num;
+       gboolean hide_timezone;
        gboolean allow_jisx0201_kana;
 
        /* Compose */
@@ -188,16 +193,9 @@ struct _PrefsCommon
        gboolean recheck_when_changing_dict;
        gboolean use_alternate;
        gboolean use_both_dicts;
-        
+
        /* Display */
-       /* obsolete fonts */
-       gchar *widgetfont_gtk1;
-       gchar *textfont_gtk1;
-       gchar *normalfont_gtk1;
-       gchar *boldfont_gtk1;
-       gchar *smallfont_gtk1;
-
-       /* new fonts */
+       /* fonts */
        gchar *widgetfont;
        gchar *textfont;
        gchar *printfont;
@@ -324,6 +322,14 @@ struct _PrefsCommon
        gulong signature_col;
        gulong emphasis_col;
        gboolean recycle_quote_colors;
+       gulong default_header_bgcolor;
+       gulong default_header_color;
+       gulong tags_bgcolor;
+       gulong tags_color;
+       gulong qs_active_bgcolor;
+       gulong qs_active_color;
+       gulong qs_error_bgcolor;
+       gulong qs_error_color;
        gboolean display_header_pane;
        gboolean display_header;
        gboolean display_xface;
@@ -364,6 +370,7 @@ struct _PrefsCommon
 
        gint statusbar_update_step;
        gboolean emulate_emacs;
+       gboolean open_selected_on_folder_open;
        ShowMsgPolicy always_show_msg;
        gboolean mark_as_read_on_new_window;
        gboolean mark_as_read_delay;
@@ -377,6 +384,12 @@ struct _PrefsCommon
        SummaryFromShow summary_from_show;
        gboolean add_address_by_click;
        gchar *pixmap_theme_path;
+#ifdef HAVE_SVG
+       gboolean enable_alpha_svg;
+       gboolean enable_pixmap_scaling;
+       gboolean pixmap_scaling_auto;
+       gint pixmap_scaling_ppi;
+#endif
        int hover_timeout; /* msecs mouse hover timeout */
        gboolean ask_mark_all_read;
        gboolean ask_apply_per_account_filtering_rules;
@@ -541,7 +554,9 @@ struct _PrefsCommon
 
 #ifndef PASSWORD_CRYPTO_OLD
        gboolean use_master_passphrase;
-       gchar *master_passphrase_hash;
+       gchar *master_passphrase;
+       gchar *master_passphrase_salt;
+       guint master_passphrase_pbkdf2_rounds;
 #endif
 };