some mail fixes and warnings removed

5 files changed, 17 insertions, 9 deletions

diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 32311d7..2d213fe 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -12,8 +12,9 @@ using namespace Opie::Core;
 const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 
 Generatemail::Generatemail()
 {
+    mCharset = "iso-8859-1";
 }
 
 Generatemail::~Generatemail()
 {
@@ -144,9 +145,9 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
     int mechanism = MAILMIME_MECHANISM_BASE64;
 
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );
+                                        strdup( mCharset.latin1() ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
 
     fields = mailmime_fields_new_filename(
@@ -169,9 +170,10 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
     if (filePart) {
         if (filename.length()>0) {
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8().data()),TextContent.utf8().length()); 
+            //err = mailmime_set_body_text(filePart,strdup( TextContent.latin1()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
             qDebug("Error setting body with file "); 
             mailmime_free( filePart );
@@ -226,10 +228,11 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     mailmime_content *content;
     mailmime_parameter *param;
     int err;
     QCString __str;
+    //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
-                                    strdup( "iso-8859-1" ) );
+                                    strdup( mCharset.latin1() ) );
     if ( param == NULL )
         goto err_free;
 
     content = mailmime_content_new_with_str( "text/plain" );
@@ -247,10 +250,11 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     txtPart = mailmime_new_empty( content, fields );
     if ( txtPart == NULL )
         goto err_free_fields;
     {
-        __str = str.utf8();
-        err = mailmime_set_body_text( txtPart, __str.data(), __str.length() );
+        //__str = str.utf8();
+        __str = QCString (str.latin1());
+        err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;
 
@@ -397,8 +401,10 @@ mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &ma
     mailmime *message, *txtPart;
     mailimf_fields *fields;
     int err;
 
+    //LR disabled for now
+    //mCharset = mail->getCharset().lower();
     fields = createImfFields( mail );
     if ( fields == NULL )
         goto err_free;
 
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h
index b9f8285..a9fb648 100644
--- a/kmicromail/libmailwrapper/generatemail.h
+++ b/kmicromail/libmailwrapper/generatemail.h
@@ -41,7 +41,8 @@ protected:
     mailmime *createMimeMail(const Opie::Core::OSmartPointer<Mail>&mail );
     clist *createRcptList( mailimf_fields *fields );
 
     static const char* USER_AGENT;
+    QString mCharset;
 };
 
 #endif
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 28d45ce..eac05e5 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -224,9 +224,10 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             char*resu = 0;
             int err = MAILIMF_NO_ERROR;
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            if ( !charset.isEmpty() ) {
+            if (false ) {
+                //if ( !charset.isEmpty() ) {
                 target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
                                                     b.latin1(), b.length(),&index, "utf-8",&resu);
                 if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 2a54381..da7065f 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -758,10 +758,10 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             int err = MAILIMF_NO_ERROR;
             
             QString charset = currentPart->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            //if ( false ) {
-            if ( !charset.isEmpty() ) {
+            if ( false ) {
+            //if ( !charset.isEmpty() ) {
                 target_body->setCharset( charset );
                 //err = mailmime_encoded_phrase_parse("iso-8859-1",
                 //                                      text, strlen(text),&index, "iso-8859-1",&res);
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index ea6bf36..3e8b51f 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -82,9 +82,9 @@ public:
     void setInreply(const QStringList&list){m_in_reply_to = list;}
     const QStringList&Inreply()const{return m_in_reply_to;}
 
     void setCharset( const QString&a ) { charset= a; }
-    const QString& getCharset() { return charset; }
+    const QString& getCharset() const { return charset; }
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message, charset;