remove External Program settings from Common Prefs/Send

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index cec5d29e9e5add7a7c35a705a25f129eb4355522..a3aa3495f1a8c9cdd4248bdb30c09cde843a3a03 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -35,7 +35,7 @@ typedef struct _PrefsCommon   PrefsCommon;
 
 typedef enum {
        RECV_DIALOG_ALWAYS,
-       RECV_DIALOG_ACTIVE,
+       RECV_DIALOG_MANUAL,
        RECV_DIALOG_NEVER
 } RecvDialogMode;
 
@@ -64,9 +64,6 @@ struct _PrefsCommon
        /* Receive */
        gboolean use_extinc;
        gchar *extinc_cmd;
-       gboolean inc_local;
-       gboolean filter_on_inc;
-       gchar *spool_path;
        gboolean scan_all_after_inc;
        gboolean autochk_newmail;
        gint autochk_itv;
@@ -74,13 +71,14 @@ struct _PrefsCommon
        gboolean newmail_notify_auto;
        gboolean newmail_notify_manu;
        gchar   *newmail_notify_cmd;
-       gint max_articles;
+       RecvDialogMode recv_dialog_mode;
+       gboolean close_recv_dialog;
+       gboolean no_recv_err_panel;
 
        /* Send */
-       gboolean use_extsend;
-       gchar *extsend_cmd;
        gboolean savemsg;
        gboolean queue_msg;
+       SendDialogMode send_dialog_mode;
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
 
@@ -115,7 +113,7 @@ struct _PrefsCommon
        gboolean enable_aspell;
        gchar *aspell_path;
        gchar *dictionary;
-       gint misspelled_col;
+       gulong misspelled_col;
        gint aspell_sugmode;
        gboolean check_while_typing;
        gboolean use_alternate;
@@ -142,6 +140,8 @@ struct _PrefsCommon
        gboolean bold_unread;
        gboolean enable_thread;
        gboolean thread_by_subject;
+       gint thread_by_subject_max_age; /*!< Max. age of a thread which was threaded
+                                        *   by subject (days) */
 
        ToolbarStyle toolbar_style;
        gboolean show_statusbar;
@@ -162,11 +162,13 @@ struct _PrefsCommon
        gint summary_col_pos[N_SUMMARY_COLS];
        gint summary_col_size[N_SUMMARY_COLS];
 
-       /* Widget size */
-       gint folderview_x;
-       gint folderview_y;
+       /* Widget visibility, position and size */
+       gint folderwin_x;
+       gint folderwin_y;
        gint folderview_width;
        gint folderview_height;
+       gboolean folderview_visible;
+
        gint folder_col_folder;
        gint folder_col_new;
        gint folder_col_unread;
@@ -175,6 +177,12 @@ struct _PrefsCommon
        gint summaryview_width;
        gint summaryview_height;
 
+       gint main_msgwin_x;
+       gint main_msgwin_y;
+       gint msgview_width;
+       gint msgview_height;
+       gboolean msgview_visible;
+
        gint mainview_x;
        gint mainview_y;
        gint mainview_width;
@@ -195,12 +203,12 @@ struct _PrefsCommon
 
        /* Message */
        gboolean enable_color;
-       gint quote_level1_col;
-       gint quote_level2_col;
-       gint quote_level3_col;
-       gint uri_col;
-       gint tgt_folder_col;
-       gint signature_col;
+       gulong quote_level1_col;
+       gulong quote_level2_col;
+       gulong quote_level3_col;
+       gulong uri_col;
+       gulong tgt_folder_col;
+       gulong signature_col;
        gboolean recycle_quote_colors;
        gboolean conv_mb_alnum;
        gboolean display_header_pane;
@@ -211,14 +219,13 @@ struct _PrefsCommon
        gint scroll_step;
        gboolean scroll_halfpage;
 
-       gboolean display_img;
-       gboolean resize_image;
-
        gchar *force_charset;
 
        gboolean show_other_header;
        GSList *disphdr_list;
 
+       gboolean attach_desc;
+
        /* MIME viewer */
        gchar *mime_image_viewer;
        gchar *mime_audio_player;
@@ -240,18 +247,15 @@ struct _PrefsCommon
        gboolean sep_folder;
        gboolean sep_msg;
        gboolean emulate_emacs;
-       gboolean show_msg_with_cursor_key;
+       gboolean always_show_msg;
        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;
+       int hover_timeout; /* msecs mouse hover timeout */
 
        /* Other */
        gchar *uri_cmd;
@@ -265,6 +269,9 @@ struct _PrefsCommon
        gboolean clean_on_exit;
        gboolean ask_on_clean;
        gboolean warn_queued_on_exit;
+
+       gint io_timeout_secs;
+       
 #if 0
 #ifdef USE_OPENSSL
        gboolean ssl_ask_unknown_valid;
@@ -280,14 +287,15 @@ struct _PrefsCommon
        gboolean work_offline;
        
        gint summary_quicksearch_type;
-       gint color_new;
+       gulong color_new;
 };
 
 extern PrefsCommon prefs_common;
 
-void prefs_common_init         ();
+void prefs_common_init         (void);
 void prefs_common_read_config  (void);
 void prefs_common_save_config  (void);
 void prefs_common_open         (void);
+PrefsCommon *prefs_common_get  (void);
 
 #endif /* __PREFS_COMMON_H__ */