the bug in libetpan seems to be fixed so we can reuse string encoding again

1 files changed, 8 insertions, 9 deletions

diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 7c1c0e4..f40aac8 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -53,9 +53,9 @@ AbstractMail* AbstractMail::getWrapper(Account*a)
 }
 
 encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
 {
-    odebug << "Decode string start" << oendl; 
+    odebug << "Decode string start" << oendl;
     char*result_text;
     size_t index = 0;
     /* reset for recursive use! */
     size_t target_length = 0;
@@ -77,27 +77,26 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
     encodedString* result = new encodedString();
     if (err == MAILIMF_NO_ERROR) {
         result->setContent(result_text,target_length);
     }
-    odebug << "Decode string finished" << oendl; 
+    odebug << "Decode string finished" << oendl;
     return result;
 }
 
 QString AbstractMail::convert_String(const char*text)
 {
-    //size_t index = 0;
+    size_t index = 0;
     char*res = 0;
     int err = MAILIMF_NO_ERROR;
 
     QString result(text);
 
-    /* due a bug in libetpan it isn't usable this moment */
-/*    int err = mailmime_encoded_phrase_parse("iso-8859-1",
-        text, strlen(text),&index, "iso-8859-1",&res);*/
-    //odebug << "Input: " << text << "" << oendl; 
+    err = mailmime_encoded_phrase_parse("iso-8859-1",
+        text, strlen(text),&index, "iso-8859-1",&res);
+    //odebug << "Input: " << text << "" << oendl;
     if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
-//        result = QString(res);
-//        odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; 
+        result = QString(res);
+//        odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
     }
     if (res) free(res);
     return result;
 }