| -rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 12 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 673f288..2d7533c 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp @@ -87,26 +87,24 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin //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); if (err == MAILIMF_NO_ERROR && res && strlen(res)) { -// result = QString(res); -// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; + result = QString(res); } + //qDebug("convert_String:%s ",result.latin1() ); if (res) free(res); return result; } /* cp & paste from launcher */ QString AbstractMail::gen_attachment_id() diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index e691082..d89a5f9 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp @@ -275,17 +275,17 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m } } RecBodyP Genericwrapper::parseMail( mailmessage * msg ) { int err = MAILIMF_NO_ERROR; - mailmime_single_fields fields; + //mailmime_single_fields fields; /* is bound to msg and will be freed there */ mailmime * mime=0; RecBodyP body = new RecBody(); - memset(&fields, 0, sizeof(struct mailmime_single_fields)); + //memset(&fields, 0, sizeof(struct mailmime_single_fields)); err = mailmessage_get_bodystructure(msg,&mime); QValueList<int>recList; traverseBody(body,msg,mime,recList); return body; } |