many ompi fixes

5 files changed, 41 insertions, 5 deletions

diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 8ee112c..ed5c898 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -77,5 +77,4 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
         mimetype = MAILMIME_MECHANISM_BINARY;
     }
-
     int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype,
     &result_text,&target_length);
@@ -96,9 +95,11 @@ QString AbstractMail::convert_String(const char*text)
 
     QString result(text);
-
+    //qDebug("convert_String %s ", text);
+    //err = mailmime_encoded_phrase_parse("iso-8859-1",
+    //                                      text, strlen(text),&index, "iso-8859-1",&res);
     err = mailmime_encoded_phrase_parse("iso-8859-1",
-                                            text, strlen(text),&index, "iso-8859-1",&res);
+                                          text, strlen(text),&index, "utf-8",&res);
     if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
-        result = QString(res);
+        result = QString::fromUtf8(res);
     }
     //qDebug("convert_String:%s ",result.latin1() );
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index d89a5f9..49227dd 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -221,4 +221,18 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             b = QString(res->Content());
             delete res;
+            size_t index = 0;
+            char*resu = 0;
+            int err = MAILIMF_NO_ERROR;
+            QString charset = part->searchParamter( "charset");
+            qDebug("CHARSET %s ",charset.latin1() );
+            if ( !charset.isEmpty() ) {
+                err = mailmime_encoded_phrase_parse(charset.latin1(),
+                                                    b.latin1(), b.length(),&index, "utf-8",&resu);
+                if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
+                    //qDebug("res %d %s ", index, resu);
+                    b = QString::fromUtf8(resu);
+                }
+                if (resu) free(resu);
+            }
             target->setBodytext(b);
             target->setDescription(part);
@@ -345,5 +359,5 @@ QString Genericwrapper::parseMailbox( mailimf_mailbox *box )
         result.append( box->mb_addr_spec );
     } else {
-        result.append( convert_String(box->mb_display_name).latin1() );
+        result.append( convert_String(box->mb_display_name) );
         result.append( " <" );
         result.append( box->mb_addr_spec );
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index d90a8d2..eb2b47d 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -753,4 +753,23 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
         if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) {
             QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding());
+
+            size_t index = 0;
+            char*res = 0;
+            int err = MAILIMF_NO_ERROR;
+            
+            QString charset = currentPart->searchParamter( "charset");
+            qDebug("CHARSET %s ",charset.latin1() );
+            //if ( false ) {
+            if ( !charset.isEmpty() ) {
+                //err = mailmime_encoded_phrase_parse("iso-8859-1",
+                //                                      text, strlen(text),&index, "iso-8859-1",&res);
+                err = mailmime_encoded_phrase_parse(charset.latin1(),
+                                                    body_text.latin1(), body_text.length(),&index, "utf-8",&res);
+                if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
+                    //qDebug("res %d %s ", index, res);
+                    body_text = QString::fromUtf8(res);
+                }
+                if (res) free(res);
+            }
             //qDebug("encoding %d text %s ",currentPart->Encoding().latin1(), body_text.latin1() );
             target_body->setDescription(currentPart);
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 0cdbae4..87f8c8a 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -126,4 +126,5 @@ RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
         return body;
     }
+    qDebug("MBOXwrapper::fetchBody ");
     body = parseMail(msg);
     mailmessage_fetch_result_free(msg,data);
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 90b5d23..982d7a6 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -129,4 +129,5 @@ void MHwrapper::answeredMail(const RecMailP&)
 RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
 {
+    qDebug("MHwrapper::fetchBody ");
     RecBodyP body = new RecBody();
     init_storage();