sync with 0.8.1cvs14

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index b102d962110d347ba870e01351de6c010b5a548e..da841e24c0c0662d1e8424e3ee2c21382a63eef0 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -58,7 +58,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;
@@ -136,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];
@@ -201,14 +200,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 */
 
@@ -216,10 +214,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;
@@ -236,7 +236,10 @@ struct _PrefsCommon
        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 */