| author | alwin <alwin> | 2003-12-18 14:23:15 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2003-12-18 14:23:15 (UTC) |
| commit | 5cb08b0c69ffc7216405b552e17ff0541578bda0 (patch) (side-by-side diff) | |
| tree | 37ea5ec8747f82a90c068422fbb99662789380ec | |
| parent | 51e56afac97c5254abfe76b65fd697a3e75e4bdd (diff) | |
| download | opie-5cb08b0c69ffc7216405b552e17ff0541578bda0.zip opie-5cb08b0c69ffc7216405b552e17ff0541578bda0.tar.gz opie-5cb08b0c69ffc7216405b552e17ff0541578bda0.tar.bz2 | |
ok. char-translation enabled again.
make sure to have the decode patch applied to libetpan!!!!
| -rw-r--r-- | noncore/net/mail/abstractmail.cpp | 17 | ||||
| -rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 6 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 17 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 6 |
4 files changed, 22 insertions, 24 deletions
diff --git a/noncore/net/mail/abstractmail.cpp b/noncore/net/mail/abstractmail.cpp index b7e5eaa..3d76c96 100644 --- a/noncore/net/mail/abstractmail.cpp +++ b/noncore/net/mail/abstractmail.cpp @@ -51,3 +51,2 @@ QString AbstractMail::convert_String(const char*text) { -#if 0 size_t index = 0; @@ -55,7 +54,5 @@ QString AbstractMail::convert_String(const char*text) - qDebug("encode start %s",text); - /* attention - doesn't work with arm systems! */ + /* attention - doesn't work with arm systems! */ int err = mailmime_encoded_phrase_parse("iso-8859-1", text, strlen(text),&index, "iso-8859-1",&res); - qDebug("encode end"); if (err != MAILIMF_NO_ERROR) { @@ -64,8 +61,8 @@ QString AbstractMail::convert_String(const char*text) } - QString result(res); - free(res); - return result; -#else - return QString(text); -#endif + if (res) { + QString result(res); + free(res); + return result; + } + return QString(text); } diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 8a86c95..838300a 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp @@ -280,3 +280,4 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) m->setDate(head->env_date); - m->setSubject(head->env_subject); + m->setSubject(convert_String((const char*)head->env_subject)); + //m->setSubject(head->env_subject); if (head->env_from!=NULL) { @@ -436,3 +437,4 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) if (current_address->ad_personal_name){ - from+=QString(current_address->ad_personal_name); + from+=convert_String((const char*)current_address->ad_personal_name); + //from+=QString(current_address->ad_personal_name); from+=" "; diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index b7e5eaa..3d76c96 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp @@ -51,3 +51,2 @@ QString AbstractMail::convert_String(const char*text) { -#if 0 size_t index = 0; @@ -55,7 +54,5 @@ QString AbstractMail::convert_String(const char*text) - qDebug("encode start %s",text); - /* attention - doesn't work with arm systems! */ + /* attention - doesn't work with arm systems! */ int err = mailmime_encoded_phrase_parse("iso-8859-1", text, strlen(text),&index, "iso-8859-1",&res); - qDebug("encode end"); if (err != MAILIMF_NO_ERROR) { @@ -64,8 +61,8 @@ QString AbstractMail::convert_String(const char*text) } - QString result(res); - free(res); - return result; -#else - return QString(text); -#endif + if (res) { + QString result(res); + free(res); + return result; + } + return QString(text); } diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 8a86c95..838300a 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -280,3 +280,4 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) m->setDate(head->env_date); - m->setSubject(head->env_subject); + m->setSubject(convert_String((const char*)head->env_subject)); + //m->setSubject(head->env_subject); if (head->env_from!=NULL) { @@ -436,3 +437,4 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) if (current_address->ad_personal_name){ - from+=QString(current_address->ad_personal_name); + from+=convert_String((const char*)current_address->ad_personal_name); + //from+=QString(current_address->ad_personal_name); from+=" "; |