1 files changed, 19 insertions, 35 deletions

diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 521cd0a..30c0707 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -130,5 +130,5 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
     mailimf_field *xmailer;
-    mailimf_mailbox *sender, *fromBox;
-    mailimf_mailbox_list *from;
-    mailimf_address_list *to, *cc, *bcc, *reply;
+    mailimf_mailbox *sender=0,*fromBox=0;
+    mailimf_mailbox_list *from=0;
+    mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
     char *subject = strdup( mail.getSubject().latin1() );
@@ -169,12 +169,12 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 err_free_xmailer:
-    mailimf_field_free( xmailer );
+    if (xmailer) mailimf_field_free( xmailer );
 err_free_fields:
-    mailimf_fields_free( fields );
+    if (fields) mailimf_fields_free( fields );
 err_free_reply:
-    mailimf_address_list_free( reply );
-    mailimf_address_list_free( bcc );
-    mailimf_address_list_free( cc );
-    mailimf_address_list_free( to );
+    if (reply) mailimf_address_list_free( reply );
+    if (bcc) mailimf_address_list_free( bcc );
+    if (cc) mailimf_address_list_free( cc );
+    if (to) mailimf_address_list_free( to );
 err_free_from:
-    mailimf_mailbox_list_free( from );
+    if (from) mailimf_mailbox_list_free( from );
 err_free_fromBox:
@@ -182,5 +182,5 @@ err_free_fromBox:
 err_free_sender:
-    mailimf_mailbox_free( sender );
+    if (sender) mailimf_mailbox_free( sender );
 err_free:
-    free( subject );
+    if (subject) free( subject );
     qDebug( "createImfFields - error" );
@@ -208,3 +208,3 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 
-    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
+    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
     if ( fields == NULL ) goto err_free_content;
@@ -464,22 +464,2 @@ char *SMTPwrapper::getFrom( mailmime *mail )
 
-SMTPaccount *SMTPwrapper::getAccount(const QString&name )
-{
-    SMTPaccount *smtp;
-
-    QList<Account> list = settings->getAccounts();
-    Account *it;
-    for ( it = list.first(); it; it = list.next() ) {
-        if ( it->getType().compare( "SMTP" ) == 0 ) {
-            smtp = static_cast<SMTPaccount *>(it);
-            if ( smtp->getName()== name ) {
-                qDebug( "SMTPaccount found for" );
-                qDebug( name );
-                return smtp;
-            }
-        }
-    }
-
-    return NULL;
-}
-
 void SMTPwrapper::progress( size_t current, size_t maximum )
@@ -615,3 +595,3 @@ free_mem:
 
-void SMTPwrapper::sendMail(const Mail&mail,bool later )
+void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 {
@@ -619,4 +599,8 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
 
-    SMTPaccount *smtp = getAccount(mail.getName());
+    SMTPaccount *smtp = aSmtp;
 
+    if (!later && !smtp) {
+        qDebug("Didn't get any send method - giving up");
+        return;
+    }
     mimeMail = createMimeMail(mail );