move signature settings to Account Prefs

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 40697729f2ff06a1a9a0f48020d371acb54f2f05..a3750a95d69992a055cde8ca2d279c00791d5a6d 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -39,6 +39,19 @@ typedef enum {
        RECV_DIALOG_NEVER
 } RecvDialogMode;
 
+typedef enum {
+       CTE_AUTO,
+       CTE_BASE64,
+       CTE_QUOTED_PRINTABLE,
+       CTE_8BIT
+} TransferEncodingMethod;
+
+typedef enum {
+       SEND_DIALOG_ALWAYS,
+       /* SEND_DIALOG_ACTIVE would be irrelevant */
+       SEND_DIALOG_NEVER
+} SendDialogMode;
+
 typedef enum
 {
        NEXTUNREADMSGDIALOG_ALWAYS,
@@ -69,10 +82,9 @@ struct _PrefsCommon
        gboolean savemsg;
        gboolean queue_msg;
        gchar *outgoing_charset;
+       TransferEncodingMethod encoding_method;
 
        /* Compose */
-       gboolean auto_sig;
-       gchar *sig_sep;
        gint undolevels;
        gint linewrap_len;
        gboolean linewrap_quote;
@@ -80,10 +92,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;
@@ -96,12 +111,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
@@ -112,20 +127,25 @@ struct _PrefsCommon
        gchar *normalfont;
        gchar *boldfont;
        gchar *smallfont;
+
+       gboolean trans_hdr;
        gboolean display_folder_unread;
-       gboolean display_img;
        gint ng_abbrev_len;
-       ToolbarStyle toolbar_style;
-       gboolean show_statusbar;
-       gboolean trans_hdr;
-       gboolean enable_thread;
-       gboolean enable_hscrollbar;
-       gboolean expand_thread;
-       gboolean bold_unread;
+
+       gboolean show_searchbar;
        gboolean swap_from;
+       gboolean expand_thread;
        gboolean use_addr_book;
        gchar *date_format;
 
+       gboolean enable_hscrollbar;
+       gboolean bold_unread;
+       gboolean enable_thread;
+       gboolean thread_by_subject;
+
+       ToolbarStyle toolbar_style;
+       gboolean show_statusbar;
+
        gint folderview_vscrollbar_policy;
 
        /* Filtering */
@@ -177,7 +197,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;
@@ -188,6 +208,9 @@ struct _PrefsCommon
        gint scroll_step;
        gboolean scroll_halfpage;
 
+       gboolean display_img;
+       gboolean resize_image;
+
        gchar *force_charset;
 
        gboolean show_other_header;
@@ -200,14 +223,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 */
 
@@ -217,9 +239,12 @@ 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;
@@ -237,8 +262,11 @@ struct _PrefsCommon
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;
-       gboolean return_receipt;
-
+#if 0
+#ifdef USE_OPENSSL
+       gboolean ssl_ask_unknown_valid;
+#endif
+#endif
        /* Memory cache*/
        gint cache_max_mem_usage;
        gint cache_min_keep_time;
@@ -246,6 +274,8 @@ struct _PrefsCommon
        /* boolean for work offline 
           stored here for use in inc.c */
        gboolean work_offline;
+       
+       gint summary_quicksearch_type;
 
 };