1 files changed, 13 insertions, 5 deletions

diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index 41e9a8c..c0dcc11 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -7,12 +7,14 @@
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
 
 class Mail;
+class MBOXwrapper;
+class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
@@ -22,34 +24,40 @@ class SMTPwrapper : public QObject
     Q_OBJECT
 
 public:
     SMTPwrapper( Settings *s ); 
     virtual ~SMTPwrapper(){}
     void sendMail(const Mail& mail,bool later=false );
+    void flushOutbox(SMTPaccount*smtp);
 
 protected:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Mail &mail );
     mailmime *createMimeMail(const Mail&mail );
     
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildTxtPart(const QString&str );
-    mailmime *buildFilePart(const QString&filename,const QString&mimetype );
-    void smtpSend( mailmime *mail,bool later );
-    mailimf_field *getField( mailimf_fields *fields, int type );
+    mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
+    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
     clist *createRcptList( mailimf_fields *fields );
-    char *getFrom( mailmime *mail );
     SMTPaccount *getAccount(const QString&from );
     void writeToFile(const QString&file, mailmime *mail );
     void readFromFile(const QString&file, char **data, size_t *size );
-    void storeMail(char*mail, size_t length, const QString&box);
     
+    static void storeMail(char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static QString getTmpFile();
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
+    static char *getFrom( mailmime *mail );
+    static char *getFrom( mailimf_field *ffrom);
+    static mailimf_field *getField( mailimf_fields *fields, int type );
+    static int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
+
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
+    
+    int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 
 #endif