Add open_selected_on_folder_open to common prefs.

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 2daf079334ab75ab642b7fceafcb376004a1a86e..533c0dde61c4e92b6f0134b95f23740e68ee00a1 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,13 +14,13 @@
  *
  * 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__
 #define __PREFS_COMMON_H__
 
 #ifdef HAVE_CONFIG_H
+#include "config.h"
 #include "claws-features.h"
 #endif
 
@@ -35,6 +35,8 @@
 #include "prefs_msg_colors.h"
 #include "prefs_summary_open.h"
 
+#define CLAWS_CONFIG_VERSION 2
+
 typedef struct _PrefsCommon    PrefsCommon;
 
 typedef enum {
@@ -90,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;
 
@@ -112,6 +114,8 @@ typedef enum
 
 struct _PrefsCommon
 {
+       gint config_version;
+
        /* Receive */
        gboolean use_extinc;
        gchar *extinc_cmd;
@@ -138,8 +142,9 @@ struct _PrefsCommon
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
        gboolean outgoing_fallback_to_ascii;
+       gboolean rewrite_first_from;
        gboolean warn_empty_subj;
-
+       gboolean hide_timezone;
        gboolean allow_jisx0201_kana;
 
        /* Compose */
@@ -231,6 +236,7 @@ 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
@@ -362,6 +368,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;
@@ -536,6 +543,13 @@ struct _PrefsCommon
        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;