5 files changed, 67 insertions, 0 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 30c0707..7e03af9 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,73 +1,86 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <libetpan/libetpan.h>
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
    : QObject()
 {
    settings = s;
+    Config cfg( "mail" );
+    cfg.setGroup( "Status" );
+    m_queuedMail =  cfg.readNumEntry( "outgoing", 0 );
+    emit queuedMails( m_queuedMail );
+    connect( this, SIGNAL( queuedMails( int ) ), this, SLOT( emitQCop( int ) )  );
+}
+void SMTPwrapper::emitQCop( int queued ) {
+    QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
+    env << queued;
 }
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
    switch ( errnum ) {
        case MAILSMTP_NO_ERROR:
            return tr( "No error" );
        case MAILSMTP_ERROR_UNEXPECTED_CODE:
            return tr( "Unexpected error code" );
        case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
            return tr( "Service not available" );
        case MAILSMTP_ERROR_STREAM:
            return tr( "Stream error" );
        case MAILSMTP_ERROR_HOSTNAME:
            return tr( "gethostname() failed" );
        case MAILSMTP_ERROR_NOT_IMPLEMENTED:
            return tr( "Not implemented" );
        case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
            return tr( "Error, action not taken" );
        case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
            return tr( "Data exceeds storage allocation" );
        case MAILSMTP_ERROR_IN_PROCESSING:
            return tr( "Error in processing" );
  //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
    //        return tr( "Insufficient system storage" );
        case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
            return tr( "Mailbox unavailable" );
        case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
            return tr( "Mailbox name not allowed" );
        case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
            return tr( "Bad command sequence" );
        case MAILSMTP_ERROR_USER_NOT_LOCAL:
            return tr( "User not local" );
        case MAILSMTP_ERROR_TRANSACTION_FAILED:
            return tr( "Transaction failed" );
        case MAILSMTP_ERROR_MEMORY:
            return tr( "Memory error" );
        case MAILSMTP_ERROR_CONNECTION_REFUSED:
            return tr( "Connection refused" );
        default:
            return tr( "Unknown error code" );
    }
 }
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
@@ -462,96 +475,100 @@ char *SMTPwrapper::getFrom( mailmime *mail )
    return getFrom(ffrom);
 }
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
    if (SMTPwrapper::sendProgress) {
        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
        qApp->processEvents();
    }
 }
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
    if (!mail) return;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    wrap->storeMessage(mail,length,box);
    delete wrap;
 }
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
    clist *rcpts = 0;
    char *from, *data;
    size_t size;
    if ( smtp == NULL ) {
        return;
    }
    from = data = 0;
    
    mailmessage * msg = 0;
    msg = mime_message_init(mail);
    mime_message_set_tmpdir(msg,getenv( "HOME" ));
    int r = mailmessage_fetch(msg,&data,&size);
    mime_message_detach_mime(msg);
    mailmessage_free(msg);
    if (r != MAIL_NO_ERROR || !data) {
        if (data) free(data);
        qDebug("Error fetching mime...");
        return;
    }
    QString tmp = data;
    tmp.replace(QRegExp("\r+",true,false),"");
    msg = 0;
    if (later) {
        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
        if (data) free( data );
+        Config cfg( "mail" );
+        cfg.setGroup( "Status" );
+        cfg.writeEntry( "outgoing", ++m_queuedMail );
+        emit queuedMails( m_queuedMail );
        return;
    }
    from = getFrom( mail );
    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
    smtpSend(from,rcpts,data,size,smtp);
    if (data) {free(data);}
    if (from) {free(from);}
    if (rcpts) smtp_address_list_free( rcpts );
 }
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
    char *server, *user, *pass;
    bool ssl;
    uint16_t port;
    mailsmtp *session;
    int err,result;
    result = 1;
    server = user = pass = 0;
    server = strdup( smtp->getServer().latin1() );
    ssl = smtp->getSSL();
    port = smtp->getPort().toUInt();
    session = mailsmtp_new( 20, &progress );
    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
        qDebug( "SSL session" );
        err = mailsmtp_ssl_connect( session, server, port );
    } else {
        qDebug( "No SSL session" );
        err = mailsmtp_socket_connect( session, server, port );
    }
    if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "INIT OK" );
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
            LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
            login.show();
            if ( QDialog::Accepted == login.exec() ) {
@@ -655,56 +672,61 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
        free(data);
    }    
    if (from) {
        free(from);
    }
    if (rcpts) {
        smtp_address_list_free( rcpts );
    }
    return res;
 }
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
    bool returnValue = true;
    if (!smtp) return false;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    if (!wrap) {
        qDebug("memory error");
        return false;
    }
    QList<RecMail> mailsToSend;
    QList<RecMail> mailsToRemove;
    QString mbox("Outgoing");
    wrap->listMessages(mbox,mailsToSend);
    if (mailsToSend.count()==0) {
        delete wrap;
        return false;
    }
    mailsToSend.setAutoDelete(false);
    sendProgress = new progressMailSend();
    sendProgress->show();
    sendProgress->setMaxMails(mailsToSend.count());
    while (mailsToSend.count()>0) {
        if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
            QMessageBox::critical(0,tr("Error sending mail"),
                tr("Error sending queued mail - breaking"));
            returnValue = false;
            break;
        }
        mailsToRemove.append(mailsToSend.at(0));
        mailsToSend.removeFirst();
        sendProgress->setCurrentMails(mailsToRemove.count());
    }
+    Config cfg( "mail" );
+    cfg.setGroup( "Status" );
+    m_queuedMail = 0;
+    cfg.writeEntry( "outgoing", m_queuedMail );
+    emit queuedMails( m_queuedMail );
    sendProgress->hide();
    delete sendProgress;
    sendProgress = 0;
    wrap->deleteMails(mbox,mailsToRemove);
    mailsToSend.setAutoDelete(true);
    delete wrap;
    return returnValue;
 }
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 0535983..05becf2 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,61 +1,71 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 #include <qpe/applnk.h>
 #include <qbitarray.h>
 #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;
 class progressMailSend;
 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);
    static progressMailSend*sendProgress;
+signals:
+    void queuedMails( int );  
 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,const QString&content);
    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
    clist *createRcptList( mailimf_fields *fields );
    
    static void storeMail(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 );
    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);
+    int m_queuedMail;
+protected slots:
+   void emitQCop( int queued );
 };
 #endif
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index e35f5b6..54453b7 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,75 +1,78 @@
 #include <qmessagebox.h>
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "smtpwrapper.h"
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qapplication.h>
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
    : MainWindow( parent, name, flags )
 {
    settings = new Settings();
    folderView->populate( settings->getAccounts() );
    connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
    connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
    connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
    // Added by Stefan Eilers to allow starting by addressbook..
    // copied from old mail2
 #if !defined(QT_NO_COP)
    connect( qApp, SIGNAL( appMessage( const QCString&, const QByteArray& ) ),
             this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
 #endif
 }
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
    // copied from old mail2
    if (msg == "writeMail(QString,QString)") {
        QDataStream stream(data,IO_ReadOnly);
        QString name, email;
        stream >> name >> email;
        // removing the whitespaces at beginning and end is needed!
        slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
    } else if (msg == "newMail()") {
        slotComposeMail();
    }
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
    ComposeMail compose( settings, this, 0 , true );
    if (!email.isEmpty()) {
        if (!name.isEmpty()) {
            compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
        } else {
            compose.setTo(email);
        }
    }
    compose.showMaximized();
    compose.slotAdjustColumns();
    compose.exec();
 }
 void OpieMail::slotComposeMail()
 {
    qDebug( "Compose Mail" );
    slotwriteMail(0l,0l);
 }
 void OpieMail::slotSendQueued()
 {
    qDebug( "Send Queued" );
    SMTPaccount *smtp = 0;
    QList<Account> list = settings->getAccounts();
    Account *it;
 //    if (list.count()==1) {
        for ( it = list.first(); it; it = list.next() ) {
            if ( it->getType().compare( "SMTP" ) == 0 ) {
                smtp = static_cast<SMTPaccount *>(it);
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 30c0707..7e03af9 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -1,73 +1,86 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <libetpan/libetpan.h>
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
    : QObject()
 {
    settings = s;
+    Config cfg( "mail" );
+    cfg.setGroup( "Status" );
+    m_queuedMail =  cfg.readNumEntry( "outgoing", 0 );
+    emit queuedMails( m_queuedMail );
+    connect( this, SIGNAL( queuedMails( int ) ), this, SLOT( emitQCop( int ) )  );
+}
+void SMTPwrapper::emitQCop( int queued ) {
+    QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
+    env << queued;
 }
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
    switch ( errnum ) {
        case MAILSMTP_NO_ERROR:
            return tr( "No error" );
        case MAILSMTP_ERROR_UNEXPECTED_CODE:
            return tr( "Unexpected error code" );
        case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
            return tr( "Service not available" );
        case MAILSMTP_ERROR_STREAM:
            return tr( "Stream error" );
        case MAILSMTP_ERROR_HOSTNAME:
            return tr( "gethostname() failed" );
        case MAILSMTP_ERROR_NOT_IMPLEMENTED:
            return tr( "Not implemented" );
        case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
            return tr( "Error, action not taken" );
        case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
            return tr( "Data exceeds storage allocation" );
        case MAILSMTP_ERROR_IN_PROCESSING:
            return tr( "Error in processing" );
  //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
    //        return tr( "Insufficient system storage" );
        case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
            return tr( "Mailbox unavailable" );
        case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
            return tr( "Mailbox name not allowed" );
        case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
            return tr( "Bad command sequence" );
        case MAILSMTP_ERROR_USER_NOT_LOCAL:
            return tr( "User not local" );
        case MAILSMTP_ERROR_TRANSACTION_FAILED:
            return tr( "Transaction failed" );
        case MAILSMTP_ERROR_MEMORY:
            return tr( "Memory error" );
        case MAILSMTP_ERROR_CONNECTION_REFUSED:
            return tr( "Connection refused" );
        default:
            return tr( "Unknown error code" );
    }
 }
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
@@ -462,96 +475,100 @@ char *SMTPwrapper::getFrom( mailmime *mail )
    return getFrom(ffrom);
 }
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
    if (SMTPwrapper::sendProgress) {
        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
        qApp->processEvents();
    }
 }
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
    if (!mail) return;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    wrap->storeMessage(mail,length,box);
    delete wrap;
 }
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
    clist *rcpts = 0;
    char *from, *data;
    size_t size;
    if ( smtp == NULL ) {
        return;
    }
    from = data = 0;
    
    mailmessage * msg = 0;
    msg = mime_message_init(mail);
    mime_message_set_tmpdir(msg,getenv( "HOME" ));
    int r = mailmessage_fetch(msg,&data,&size);
    mime_message_detach_mime(msg);
    mailmessage_free(msg);
    if (r != MAIL_NO_ERROR || !data) {
        if (data) free(data);
        qDebug("Error fetching mime...");
        return;
    }
    QString tmp = data;
    tmp.replace(QRegExp("\r+",true,false),"");
    msg = 0;
    if (later) {
        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
        if (data) free( data );
+        Config cfg( "mail" );
+        cfg.setGroup( "Status" );
+        cfg.writeEntry( "outgoing", ++m_queuedMail );
+        emit queuedMails( m_queuedMail );
        return;
    }
    from = getFrom( mail );
    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
    smtpSend(from,rcpts,data,size,smtp);
    if (data) {free(data);}
    if (from) {free(from);}
    if (rcpts) smtp_address_list_free( rcpts );
 }
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
    char *server, *user, *pass;
    bool ssl;
    uint16_t port;
    mailsmtp *session;
    int err,result;
    result = 1;
    server = user = pass = 0;
    server = strdup( smtp->getServer().latin1() );
    ssl = smtp->getSSL();
    port = smtp->getPort().toUInt();
    session = mailsmtp_new( 20, &progress );
    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
        qDebug( "SSL session" );
        err = mailsmtp_ssl_connect( session, server, port );
    } else {
        qDebug( "No SSL session" );
        err = mailsmtp_socket_connect( session, server, port );
    }
    if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "INIT OK" );
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
            LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
            login.show();
            if ( QDialog::Accepted == login.exec() ) {
@@ -655,56 +672,61 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
        free(data);
    }    
    if (from) {
        free(from);
    }
    if (rcpts) {
        smtp_address_list_free( rcpts );
    }
    return res;
 }
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
    bool returnValue = true;
    if (!smtp) return false;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    if (!wrap) {
        qDebug("memory error");
        return false;
    }
    QList<RecMail> mailsToSend;
    QList<RecMail> mailsToRemove;
    QString mbox("Outgoing");
    wrap->listMessages(mbox,mailsToSend);
    if (mailsToSend.count()==0) {
        delete wrap;
        return false;
    }
    mailsToSend.setAutoDelete(false);
    sendProgress = new progressMailSend();
    sendProgress->show();
    sendProgress->setMaxMails(mailsToSend.count());
    while (mailsToSend.count()>0) {
        if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
            QMessageBox::critical(0,tr("Error sending mail"),
                tr("Error sending queued mail - breaking"));
            returnValue = false;
            break;
        }
        mailsToRemove.append(mailsToSend.at(0));
        mailsToSend.removeFirst();
        sendProgress->setCurrentMails(mailsToRemove.count());
    }
+    Config cfg( "mail" );
+    cfg.setGroup( "Status" );
+    m_queuedMail = 0;
+    cfg.writeEntry( "outgoing", m_queuedMail );
+    emit queuedMails( m_queuedMail );
    sendProgress->hide();
    delete sendProgress;
    sendProgress = 0;
    wrap->deleteMails(mbox,mailsToRemove);
    mailsToSend.setAutoDelete(true);
    delete wrap;
    return returnValue;
 }
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index 0535983..05becf2 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -1,61 +1,71 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 #include <qpe/applnk.h>
 #include <qbitarray.h>
 #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;
 class progressMailSend;
 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);
    static progressMailSend*sendProgress;
+signals:
+    void queuedMails( int );  
 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,const QString&content);
    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
    clist *createRcptList( mailimf_fields *fields );
    
    static void storeMail(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 );
    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);
+    int m_queuedMail;
+protected slots:
+   void emitQCop( int queued );
 };
 #endif