Add pop before smtp

[claws.git] / src / prefs_account.h

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 341174b811a00c4da9a0cb0f98289c4884524ace..9a0dc8714216f8ad709413679701112e1ce462ae 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,11 @@
 typedef struct _PrefsAccount   PrefsAccount;
 
 #include "folder.h"
+#include "smtp.h"
+
+#ifdef USE_GPGME
+#  include "rfc2015.h"
+#endif
 
 typedef enum {
        A_POP3,
@@ -39,6 +44,21 @@ typedef enum {
        A_LOCAL
 } RecvProtocol;
 
+typedef enum {
+       /* just login (pop before smtp) */
+       STYPE_POP_BEFORE_SMTP,
+       /* login and retrieve messages, as before */
+       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 */
+       STYPE_DELETE, 
+       /* download + remove Mail from Server */
+       STYPE_DOWNLOAD,
+} Pop3SessionType;
+
 #if USE_GPGME
 typedef enum {
        SIGN_KEY_DEFAULT,
@@ -47,14 +67,6 @@ typedef enum {
 } 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;
@@ -66,7 +78,6 @@ struct _PrefsAccount
 
        /* Server info */
        RecvProtocol protocol;
-       gchar *inbox;
        gchar *recv_server;
        gchar *smtp_server;
        gchar *nntp_server;
@@ -79,47 +90,62 @@ struct _PrefsAccount
        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 */
        gchar *tmp_pass;
-       gchar *tmp_smtp_passwd;
 
        /* Receive */
        gboolean rmmail;
+       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;
 
-       gchar *imap_dir;
+       /* selective Download */
+       gint   session;
+       GSList *msg_list;
 
        /* Send */
-       gboolean  add_date;
-       gboolean  gen_msgid;
-       gboolean  add_customhdr;
-       gboolean  set_autocc;
-       gchar    *auto_cc;
-       gboolean  set_autobcc;
-       gchar    *auto_bcc;
-       gboolean  set_autoreplyto;
-       gchar    *auto_replyto;
+       gboolean add_date;
+       gboolean gen_msgid;
+       gboolean add_customhdr;
        gboolean use_smtp_auth;
-       gchar    *smtp_userid;
-       gchar    *smtp_passwd;
+       SMTPAuthType smtp_auth_type;
+       gchar *smtp_userid;
+       gchar *smtp_passwd;
+
+       /* Temporarily preserved password */
+       gchar *tmp_smtp_pass;
+
        gboolean pop_before_smtp;
 
        GSList *customhdr_list;
 
        /* Compose */
        gchar *sig_path;
+       gboolean  set_autocc;
+       gchar    *auto_cc;
+       gboolean  set_autobcc;
+       gchar    *auto_bcc;
+       gboolean  set_autoreplyto;
+       gchar    *auto_replyto;
 
 #if USE_GPGME
        /* Privacy */
+       gboolean default_encrypt;
+       gboolean default_sign;
+       gboolean ascii_armored;
+       gboolean clearsign;
        SignKeyType sign_key;
        gchar *sign_key_id;
 #endif /* USE_GPGME */
@@ -135,6 +161,28 @@ struct _PrefsAccount
        gushort   nntpport;
        gboolean  set_domain;
        gchar    *domain;
+       gboolean  mark_crosspost_read;
+       gint      crosspost_col;
+
+       /* Use this command to open a socket, rather than doing so
+        * directly.  Good if you want to perhaps use a special socks
+        * tunnel command, or run IMAP-over-SSH.  In this case the
+        * server, port etc are only for the user's own information
+        * and are not used.  username and password are used to
+        * authenticate the account only if necessary, since some
+        * tunnels will implicitly authenticate by running e.g. imapd
+        * as a particular user. */
+       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;