changed 'dictionary_path' to 'dictionary' to be consistent

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 1c98157118c72adf9045c58a0f80451eac1b5865..518f86c7b090760261c0bd758f6e9b1bd03860da 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -32,22 +32,30 @@
 
 typedef struct _PrefsCommon    PrefsCommon;
 
+typedef enum {
+       RECV_DIALOG_ALWAYS,
+       RECV_DIALOG_ACTIVE,
+       RECV_DIALOG_NEVER
+} RecvDialogMode;
+
 struct _PrefsCommon
 {
        /* Receive */
        gboolean use_extinc;
-       gchar *extinc_path;
+       gchar *extinc_cmd;
        gboolean inc_local;
        gboolean filter_on_inc;
        gchar *spool_path;
+       gboolean scan_all_after_inc;
        gboolean autochk_newmail;
        gint autochk_itv;
        gboolean chk_on_startup;
+       gboolean noerrorpanel;
        gint max_articles;
 
        /* Send */
        gboolean use_extsend;
-       gchar *extsend_path;
+       gchar *extsend_cmd;
        gboolean savemsg;
        gboolean queue_msg;
        gchar *outgoing_charset;
@@ -61,17 +69,35 @@ struct _PrefsCommon
        gint linewrap_len;
        gboolean linewrap_quote;
        gboolean linewrap_at_send;
+       gboolean auto_exteditor;
+       gboolean reply_account_autosel;
+       gboolean forward_account_autosel;
+       gboolean reedit_account_autosel;
        gboolean show_ruler;
-
+       gchar *fw_quotemark;
+       gchar *fw_quotefmt;
+       gboolean forward_as_attachment;
+       gboolean smart_wrapping;
+#if USE_PSPELL
+       gboolean enable_pspell;
+       gchar *pspell_path;
+       gchar *dictionary;
+#endif
+        
        /* Display */
        gchar *widgetfont;
        gchar *textfont;
+       gchar *normalfont;
+       gchar *boldfont;
+       gchar *smallfont;
        gboolean display_folder_unread;
        ToolbarStyle toolbar_style;
        gboolean show_statusbar;
        gboolean trans_hdr;
        gboolean enable_thread;
        gboolean enable_hscrollbar;
+       gboolean expand_thread;
+       gboolean bold_unread;
        gboolean swap_from;
        gboolean use_addr_book;
        gchar *date_format;
@@ -79,9 +105,11 @@ struct _PrefsCommon
        /* Filtering */
        GSList *fltlist;
 
+       gint kill_score;
+       gint important_score;
+
        gboolean show_mark;
        gboolean show_unread;
-       gboolean show_retrieve_dialog;
        gboolean show_mime;
        gboolean show_number;
        gboolean show_score;
@@ -133,6 +161,7 @@ struct _PrefsCommon
        gint quote_level2_col;
        gint quote_level3_col;
        gint uri_col;
+       gint tgt_folder_col;
        gushort sig_col;
        gboolean recycle_quote_colors;
        gboolean conv_mb_alnum;
@@ -154,13 +183,13 @@ struct _PrefsCommon
        gchar *mime_audio_player;
 
        /* Privacy */
-       gboolean gpgme_warning;
        gboolean default_encrypt;
        gboolean default_sign;
-        gboolean auto_check_signatures;
-        gboolean signature_popup;
+       gboolean auto_check_signatures;
+       gboolean gpg_signature_popup;
        gboolean passphrase_grab;
        gchar *default_signkey;
+       gboolean gpg_warning;
 
        /* Interface */
        gboolean sep_folder;
@@ -169,6 +198,7 @@ struct _PrefsCommon
        gboolean open_unread_on_enter;
        gboolean open_inbox_on_inc;
        gboolean immediate_exec;
+       RecvDialogMode recv_dialog_mode;
        gboolean add_address_by_click;
 
        gboolean confirm_on_exit;