4 files changed, 52 insertions, 182 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 285561c..521cd0a 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -114,10 +114,8 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
-        char *str = strdup( (*it).latin1() );
-        int err = mailimf_address_list_add_parse( addresses, str );
+        int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
-            free( str );
         } else {
             qDebug( "Parse success! %s",(*it).latin1());
@@ -197,5 +195,4 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     mailmime_content *content;
     mailmime_parameter *param;
-    char *txt = strdup( str.latin1() );
     int err;
 
@@ -210,5 +207,5 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
 
-    fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT );
+    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
     if ( fields == NULL ) goto err_free_content;
 
@@ -216,5 +213,5 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     if ( txtPart == NULL ) goto err_free_fields;
 
-    err = mailmime_set_body_text( txtPart, txt, strlen( txt ) );
+    err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
@@ -230,5 +227,4 @@ err_free_param:
     mailmime_parameter_free( param );
 err_free:
-    free( txt );
     qDebug( "buildTxtPart - error" );
 
@@ -253,6 +249,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         file = strdup( filename.latin1() );   // full name with path
     }
-    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
-
+    
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
@@ -261,5 +256,4 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         param = mailmime_parameter_new( strdup( "charset" ),
                                         strdup( "iso-8859-1" ) );
-        disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
@@ -268,5 +262,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
                 disptype, name,
                 mechanism );
-    content = mailmime_content_new_with_str( mime );
+    content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
     if (content!=0 && fields != 0) {
         if (param) {
@@ -286,5 +280,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup(TextContent.ascii()),TextContent.length());
+            err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
@@ -301,8 +295,4 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         if (content) {
             mailmime_content_free( content );
-        } else {
-            if (mime) {
-                free( mime );
-            }
         }
         if (fields) {
@@ -360,9 +350,6 @@ mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
     mailmime_set_imf_fields( message, fields );
 
-    if (mail.getAttachments().count()==0) {
-        txtPart = buildTxtPart( mail.getMessage() );
-    } else {
-        txtPart = buildFilePart("","text/plain",mail.getMessage());
-    }
+    txtPart = buildTxtPart( mail.getMessage() );
+    
     if ( txtPart == NULL ) goto err_free_message;
 
@@ -472,5 +459,4 @@ char *SMTPwrapper::getFrom( mailmime *mail )
     /* no need to delete - its just a pointer to structure content */
     mailimf_field *ffrom = 0;
-    char*f = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
@@ -497,59 +483,4 @@ SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 }
 
-QString SMTPwrapper::getTmpFile() {
-    int num = 0;
-    QString unique;
-
-    QDir dir( "/tmp" );
-
-    QStringList list = dir.entryList( "opiemail-tmp-*" );
-
-    do {
-        unique.setNum( num++ );
-    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
-
-    return "/tmp/opiemail-tmp-" + unique;
-}
-
-void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
-{
-    FILE *f;
-    int err, col = 0;
-
-    f = fopen( file.latin1(), "w" );
-    if ( f == NULL ) {
-        qDebug( "writeToFile: error opening file" );
-        return;
-    }
-
-    err = mailmime_write( f, &col, mail );
-    if ( err != MAILIMF_NO_ERROR ) {
-        fclose( f );
-        qDebug( "writeToFile: error writing mailmime" );
-        return;
-    }
-
-    fclose( f );
-}
-
-void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
-{
-
-    QFile msg_cache(file);
-    QString msg = "";
-    msg_cache.open(IO_ReadOnly);
-    char*message = new char[4096];
-    memset(message,0,4096);
-    while (msg_cache.readBlock(message,4095)>0) {
-         msg+=message;
-         memset(message,0,4096);
-    }
-    delete message;
-    *data = (char*)malloc(msg.length()+1*sizeof(char));
-    memset(*data,0,msg.length()+1);
-    memcpy(*data,msg.ascii(),msg.length());
-    *size=msg.length();
-}
-
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
@@ -579,13 +510,21 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     }
     from = data = 0;
-
-    QString file = getTmpFile();
-    writeToFile( file, mail );
-    readFromFile( file, &data, &size );
-    QFile f( file );
-    f.remove();
-
+    
+    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(data,size,"Outgoing");
+        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
         if (data) free( data );
         return;
@@ -689,9 +628,9 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
         sendProgress->setMaxMails(1);
         smtpSend( mimeMail,later,smtp);
-        mailmime_free( mimeMail );
         qDebug("Clean up done");
         sendProgress->hide();
         delete sendProgress;
         sendProgress = 0;
+        mailmime_free( mimeMail );
     }
 }
@@ -748,5 +687,5 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     if (!smtp) return false;
 
-   QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
@@ -771,5 +710,4 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
-
             returnValue = false;
             break;
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 66180b7..f734fa4 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -44,10 +44,7 @@ protected:
     clist *createRcptList( mailimf_fields *fields );
     SMTPaccount *getAccount(const QString&from );
-    void writeToFile(const QString&file, mailmime *mail );
-    void readFromFile(const QString&file, char **data, size_t *size );
     
     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 );
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 285561c..521cd0a 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -114,10 +114,8 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
-        char *str = strdup( (*it).latin1() );
-        int err = mailimf_address_list_add_parse( addresses, str );
+        int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
-            free( str );
         } else {
             qDebug( "Parse success! %s",(*it).latin1());
@@ -197,5 +195,4 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     mailmime_content *content;
     mailmime_parameter *param;
-    char *txt = strdup( str.latin1() );
     int err;
 
@@ -210,5 +207,5 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
 
-    fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT );
+    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
     if ( fields == NULL ) goto err_free_content;
 
@@ -216,5 +213,5 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
     if ( txtPart == NULL ) goto err_free_fields;
 
-    err = mailmime_set_body_text( txtPart, txt, strlen( txt ) );
+    err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
@@ -230,5 +227,4 @@ err_free_param:
     mailmime_parameter_free( param );
 err_free:
-    free( txt );
     qDebug( "buildTxtPart - error" );
 
@@ -253,6 +249,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         file = strdup( filename.latin1() );   // full name with path
     }
-    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
-
+    
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
@@ -261,5 +256,4 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         param = mailmime_parameter_new( strdup( "charset" ),
                                         strdup( "iso-8859-1" ) );
-        disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
@@ -268,5 +262,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
                 disptype, name,
                 mechanism );
-    content = mailmime_content_new_with_str( mime );
+    content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
     if (content!=0 && fields != 0) {
         if (param) {
@@ -286,5 +280,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup(TextContent.ascii()),TextContent.length());
+            err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
@@ -301,8 +295,4 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
         if (content) {
             mailmime_content_free( content );
-        } else {
-            if (mime) {
-                free( mime );
-            }
         }
         if (fields) {
@@ -360,9 +350,6 @@ mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
     mailmime_set_imf_fields( message, fields );
 
-    if (mail.getAttachments().count()==0) {
-        txtPart = buildTxtPart( mail.getMessage() );
-    } else {
-        txtPart = buildFilePart("","text/plain",mail.getMessage());
-    }
+    txtPart = buildTxtPart( mail.getMessage() );
+    
     if ( txtPart == NULL ) goto err_free_message;
 
@@ -472,5 +459,4 @@ char *SMTPwrapper::getFrom( mailmime *mail )
     /* no need to delete - its just a pointer to structure content */
     mailimf_field *ffrom = 0;
-    char*f = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
@@ -497,59 +483,4 @@ SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 }
 
-QString SMTPwrapper::getTmpFile() {
-    int num = 0;
-    QString unique;
-
-    QDir dir( "/tmp" );
-
-    QStringList list = dir.entryList( "opiemail-tmp-*" );
-
-    do {
-        unique.setNum( num++ );
-    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
-
-    return "/tmp/opiemail-tmp-" + unique;
-}
-
-void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
-{
-    FILE *f;
-    int err, col = 0;
-
-    f = fopen( file.latin1(), "w" );
-    if ( f == NULL ) {
-        qDebug( "writeToFile: error opening file" );
-        return;
-    }
-
-    err = mailmime_write( f, &col, mail );
-    if ( err != MAILIMF_NO_ERROR ) {
-        fclose( f );
-        qDebug( "writeToFile: error writing mailmime" );
-        return;
-    }
-
-    fclose( f );
-}
-
-void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
-{
-
-    QFile msg_cache(file);
-    QString msg = "";
-    msg_cache.open(IO_ReadOnly);
-    char*message = new char[4096];
-    memset(message,0,4096);
-    while (msg_cache.readBlock(message,4095)>0) {
-         msg+=message;
-         memset(message,0,4096);
-    }
-    delete message;
-    *data = (char*)malloc(msg.length()+1*sizeof(char));
-    memset(*data,0,msg.length()+1);
-    memcpy(*data,msg.ascii(),msg.length());
-    *size=msg.length();
-}
-
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
@@ -579,13 +510,21 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     }
     from = data = 0;
-
-    QString file = getTmpFile();
-    writeToFile( file, mail );
-    readFromFile( file, &data, &size );
-    QFile f( file );
-    f.remove();
-
+    
+    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(data,size,"Outgoing");
+        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
         if (data) free( data );
         return;
@@ -689,9 +628,9 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
         sendProgress->setMaxMails(1);
         smtpSend( mimeMail,later,smtp);
-        mailmime_free( mimeMail );
         qDebug("Clean up done");
         sendProgress->hide();
         delete sendProgress;
         sendProgress = 0;
+        mailmime_free( mimeMail );
     }
 }
@@ -748,5 +687,5 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     if (!smtp) return false;
 
-   QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
@@ -771,5 +710,4 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
-
             returnValue = false;
             break;
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index 66180b7..f734fa4 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -44,10 +44,7 @@ protected:
     clist *createRcptList( mailimf_fields *fields );
     SMTPaccount *getAccount(const QString&from );
-    void writeToFile(const QString&file, mailmime *mail );
-    void readFromFile(const QString&file, char **data, size_t *size );
     
     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 );