add SSL manager

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 1593f51c8be4695839736968bde31cf100a2dfbc..c5282800aae891dbd50939ec438766d0d84d6073 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -39,6 +39,12 @@ typedef enum {
        RECV_DIALOG_NEVER
 } RecvDialogMode;
 
+typedef enum {
+       SEND_DIALOG_ALWAYS,
+       /* SEND_DIALOG_ACTIVE would be irrelevant */
+       SEND_DIALOG_NEVER
+} SendDialogMode;
+
 typedef enum
 {
        NEXTUNREADMSGDIALOG_ALWAYS,
@@ -58,7 +64,6 @@ struct _PrefsCommon
        gboolean autochk_newmail;
        gint autochk_itv;
        gboolean chk_on_startup;
-       gboolean noerrorpanel;
        gboolean newmail_notify_auto;
        gboolean newmail_notify_manu;
        gchar   *newmail_notify_cmd;
@@ -81,10 +86,13 @@ struct _PrefsCommon
        gboolean linewrap_at_send;
        gboolean auto_exteditor;
        gboolean reply_account_autosel;
+       gboolean default_reply_list;
        gboolean forward_account_autosel;
        gboolean reedit_account_autosel;
        gboolean show_ruler;
-
+       gboolean autosave;
+       gint autosave_length;
+       
        /* Quote */
        gboolean reply_with_quote;
        gchar *quotemark;
@@ -97,12 +105,12 @@ struct _PrefsCommon
        gboolean block_cursor;
        gchar *quote_chars;
        
-#if USE_PSPELL
-       gboolean enable_pspell;
-       gchar *pspell_path;
+#if USE_ASPELL
+       gboolean enable_aspell;
+       gchar *aspell_path;
        gchar *dictionary;
        gint misspelled_col;
-       gint pspell_sugmode;
+       gint aspell_sugmode;
        gboolean check_while_typing;
        gboolean use_alternate;
 #endif
@@ -118,6 +126,7 @@ struct _PrefsCommon
        gint ng_abbrev_len;
        ToolbarStyle toolbar_style;
        gboolean show_statusbar;
+       gboolean show_searchbar;
        gboolean trans_hdr;
        gboolean enable_thread;
        gboolean enable_hscrollbar;
@@ -136,7 +145,7 @@ struct _PrefsCommon
        gint important_score;
 
        /* Actions */
-       GSList *actionslst;
+       GSList *actions_list;
 
        /* Summary columns visibility, position and size */
        gboolean summary_col_visible[N_SUMMARY_COLS];
@@ -178,7 +187,7 @@ struct _PrefsCommon
        gint quote_level3_col;
        gint uri_col;
        gint tgt_folder_col;
-       gushort sig_col;
+       gint signature_col;
        gboolean recycle_quote_colors;
        gboolean conv_mb_alnum;
        gboolean display_header_pane;
@@ -201,14 +210,13 @@ struct _PrefsCommon
 
        GList *mime_open_cmd_history;
 
-#if USE_GPGME 
+#if USE_GPGME
        /* Privacy */
        gboolean auto_check_signatures;
        gboolean gpg_signature_popup;
        gboolean store_passphrase;
-       gint     store_passphrase_timeout;
+       gint store_passphrase_timeout;
        gboolean passphrase_grab;
-       gchar *default_signkey;
        gboolean gpg_warning;
 #endif /* USE_GPGME */
 
@@ -218,9 +226,13 @@ struct _PrefsCommon
        gboolean emulate_emacs;
        gboolean show_msg_with_cursor_key;
        gboolean open_unread_on_enter;
+       gboolean mark_as_read_on_new_window;
        gboolean open_inbox_on_inc;
        gboolean immediate_exec;
        RecvDialogMode recv_dialog_mode;
+       SendDialogMode send_dialog_mode;
+       gboolean close_recv_dialog;
+       gboolean no_recv_err_panel;
        NextUnreadMsgDialogShow next_unread_msg_dialog;
        gboolean add_address_by_click;
        gchar *pixmap_theme_path;
@@ -237,8 +249,9 @@ struct _PrefsCommon
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;
-       gboolean return_receipt;
-
+#ifdef USE_SSL
+       gboolean ssl_ask_unknown_valid;
+#endif
        /* Memory cache*/
        gint cache_max_mem_usage;
        gint cache_min_keep_time;