typedef struct _PrefsAccount PrefsAccount;
#include "folder.h"
+#include "smtp.h"
#ifdef USE_GPGME
# include "rfc2015.h"
} RecvProtocol;
typedef enum {
+ /* just login (pop before smtp) */
+ STYPE_POP_BEFORE_SMTP,
/* login and retrieve messages, as before */
- RETR_NORMAL,
- /* send TOP to server and retrieve Header */
- RETR_HEADER,
+ STYPE_NORMAL,
+ /* send TOP to server and retrieve all available Headers */
+ STYPE_PREVIEW_ALL,
+ /* send TOP to server and retrieve new Headers */
+ STYPE_PREVIEW_NEW,
/* delete selected Headers on Server */
- DELE_HEADER
+ STYPE_DELETE,
+ /* download + remove Mail from Server */
+ STYPE_DOWNLOAD,
} Pop3SessionType;
#if USE_GPGME
} SignKeyType;
#endif /* USE_GPGME */
-#if USE_SSL
-typedef enum {
- SSL_SMTP_NONE,
- SSL_SMTP_TUNNEL,
- SSL_SMTP_STARTTLS
-} SSLSMTPType;
-#endif /* USE_SSL */
-
struct _PrefsAccount
{
gchar *account_name;
gchar * mail_command;
#if USE_SSL
- /* SSL */
- gboolean ssl_pop;
- gboolean ssl_imap;
- SSLSMTPType ssl_smtp;
+ SSLType ssl_pop;
+ SSLType ssl_imap;
+ SSLType ssl_nntp;
+ SSLType ssl_smtp;
#endif /* USE_SSL */
/* Temporarily preserved password */
/* Receive */
gboolean rmmail;
- gchar *leave_time;
+ gint msg_leave_time;
gboolean getall;
gboolean recv_at_getall;
+ gboolean sd_rmmail_on_download;
+ gboolean sd_filter_on_recv;
gboolean enable_size_limit;
gint size_limit;
gboolean filter_on_recv;
gchar *inbox;
/* selective Download */
- gint session_type;
- GSList *to_delete;
-
- gchar *imap_dir;
+ gint session;
+ GSList *msg_list;
/* Send */
gboolean add_date;
gboolean gen_msgid;
gboolean add_customhdr;
gboolean use_smtp_auth;
+ SMTPAuthType smtp_auth_type;
gchar *smtp_userid;
gchar *smtp_passwd;
#if USE_GPGME
/* Privacy */
gboolean default_encrypt;
- gboolean ascii_armored;
gboolean default_sign;
+ gboolean ascii_armored;
+ gboolean clearsign;
SignKeyType sign_key;
gchar *sign_key_id;
#endif /* USE_GPGME */
gboolean set_tunnelcmd;
gchar *tunnelcmd;
+ gchar *imap_dir;
+
+ gboolean set_sent_folder;
+ gchar *sent_folder;
+ gboolean set_draft_folder;
+ gchar *draft_folder;
+ gboolean set_trash_folder;
+ gchar *trash_folder;
+
/* Default or not */
gboolean is_default;
/* Unique account ID */