1 files changed, 17 insertions, 10 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 75e4891..7f6aac1 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,6 +1,7 @@
+// -*- Mode: C++; -*-
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 
 #include <qpe/applnk.h>
 
 #include <qbitarray.h>
@@ -17,60 +18,66 @@ struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 struct mailsmtp;
+class SMTPaccount;
 
 class SMTPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
-    SMTPwrapper( Settings *s );
-    virtual ~SMTPwrapper(){}
-    void sendMail(const Mail& mail,SMTPaccount*smtp,bool later=false );
-    bool flushOutbox(SMTPaccount*smtp);
+    SMTPwrapper(SMTPaccount * aSmtp);
+    virtual ~SMTPwrapper();
+    void sendMail(const Mail& mail,bool later=false );
+    bool flushOutbox();
 
     static progressMailSend*sendProgress;
 
 signals:
     void queuedMails( int );
 
 protected:
+    mailsmtp *m_smtp;
+    SMTPaccount * m_SmtpAccount;
+
+    void connect_server();
+    void disc_server();
+    int start_smtp_tls();
+    
     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,const QString&content);
-    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
+    void smtpSend( mailmime *mail,bool later);
     clist *createRcptList( mailimf_fields *fields );
 
     static void storeMail(const char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     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 start_smtp_tls(mailsmtp *session);
 
-    int smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp );
+    int smtpSend(char*from,clist*rcpts,const char*data,size_t size);
 
     void storeMail(mailmime*mail, const QString&box);
-    Settings *settings;
 
-    int sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which);
+    int sendQueuedMail(AbstractMail*wrap,RecMail*which);
     void storeFailedMail(const char*data,unsigned int size, const char*failuremessage);
 
     int m_queuedMail;
     static const char* USER_AGENT;
 
 protected slots:
-   void emitQCop( int queued );
+    void emitQCop( int queued );
 
 };
 
 #endif