sync with 0.8.1cvs12

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 8be868a31427bb9e156115918f2b2c894072c509..bd36ea9c233dc62b4c7ae8ea2962f05d812cb1a4 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -58,7 +58,9 @@ 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;
        gint max_articles;
 
        /* Send */
@@ -74,6 +76,7 @@ struct _PrefsCommon
        gint undolevels;
        gint linewrap_len;
        gboolean linewrap_quote;
+       gboolean autowrap;
        gboolean linewrap_at_send;
        gboolean auto_exteditor;
        gboolean reply_account_autosel;
@@ -88,8 +91,11 @@ struct _PrefsCommon
        gchar *fw_quotemark;
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
+       gboolean redirect_keep_from;
        gboolean smart_wrapping;
        gboolean block_cursor;
+       gchar *quote_chars;
+       
 #if USE_PSPELL
        gboolean enable_pspell;
        gchar *pspell_path;
@@ -107,6 +113,8 @@ struct _PrefsCommon
        gchar *boldfont;
        gchar *smallfont;
        gboolean display_folder_unread;
+       gboolean display_img;
+       gint ng_abbrev_len;
        ToolbarStyle toolbar_style;
        gboolean show_statusbar;
        gboolean trans_hdr;
@@ -118,6 +126,8 @@ struct _PrefsCommon
        gboolean use_addr_book;
        gchar *date_format;
 
+       gint folderview_vscrollbar_policy;
+
        /* Filtering */
        GSList *fltlist;
 
@@ -125,7 +135,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];
@@ -190,10 +200,12 @@ 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;
        gboolean passphrase_grab;
        gchar *default_signkey;
        gboolean gpg_warning;
@@ -203,10 +215,12 @@ struct _PrefsCommon
        gboolean sep_folder;
        gboolean sep_msg;
        gboolean emulate_emacs;
+       gboolean show_msg_with_cursor_key;
        gboolean open_unread_on_enter;
        gboolean open_inbox_on_inc;
        gboolean immediate_exec;
        RecvDialogMode recv_dialog_mode;
+       gboolean no_recv_err_panel;
        NextUnreadMsgDialogShow next_unread_msg_dialog;
        gboolean add_address_by_click;
        gchar *pixmap_theme_path;
@@ -216,11 +230,22 @@ struct _PrefsCommon
        gchar *print_cmd;
        gchar *ext_editor_cmd;
 
-       gboolean confirm_on_exit;
+        gboolean cliplog;
+        guint loglength;
+
+        gboolean confirm_on_exit;
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;
-       gboolean return_receipt;
+
+       /* Memory cache*/
+       gint cache_max_mem_usage;
+       gint cache_min_keep_time;
+       
+       /* boolean for work offline 
+          stored here for use in inc.c */
+       gboolean work_offline;
+
 };
 
 extern PrefsCommon prefs_common;
@@ -230,6 +255,4 @@ void prefs_common_read_config       (void);
 void prefs_common_save_config  (void);
 void prefs_common_open         (void);
 
-void prefs_quote_description   (void);
-
 #endif /* __PREFS_COMMON_H__ */