-rw-r--r-- | noncore/net/mail/abstractmail.cpp | 7 | ||||
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 7 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 6 |
4 files changed, 12 insertions, 14 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) | |||
51 | { | 51 | { |
52 | #if 0 | ||
53 | size_t index = 0; | 52 | size_t index = 0; |
@@ -55,3 +54,2 @@ QString AbstractMail::convert_String(const char*text) | |||
55 | 54 | ||
56 | qDebug("encode start %s",text); | ||
57 | /* attention - doesn't work with arm systems! */ | 55 | /* attention - doesn't work with arm systems! */ |
@@ -59,3 +57,2 @@ QString AbstractMail::convert_String(const char*text) | |||
59 | text, strlen(text),&index, "iso-8859-1",&res); | 57 | text, strlen(text),&index, "iso-8859-1",&res); |
60 | qDebug("encode end"); | ||
61 | if (err != MAILIMF_NO_ERROR) { | 58 | if (err != MAILIMF_NO_ERROR) { |
@@ -64,2 +61,3 @@ QString AbstractMail::convert_String(const char*text) | |||
64 | } | 61 | } |
62 | if (res) { | ||
65 | QString result(res); | 63 | QString result(res); |
@@ -67,5 +65,4 @@ QString AbstractMail::convert_String(const char*text) | |||
67 | return result; | 65 | return result; |
68 | #else | 66 | } |
69 | return QString(text); | 67 | return QString(text); |
70 | #endif | ||
71 | } | 68 | } |
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) | |||
280 | m->setDate(head->env_date); | 280 | m->setDate(head->env_date); |
281 | m->setSubject(head->env_subject); | 281 | m->setSubject(convert_String((const char*)head->env_subject)); |
282 | //m->setSubject(head->env_subject); | ||
282 | if (head->env_from!=NULL) { | 283 | if (head->env_from!=NULL) { |
@@ -436,3 +437,4 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
436 | if (current_address->ad_personal_name){ | 437 | if (current_address->ad_personal_name){ |
437 | from+=QString(current_address->ad_personal_name); | 438 | from+=convert_String((const char*)current_address->ad_personal_name); |
439 | //from+=QString(current_address->ad_personal_name); | ||
438 | from+=" "; | 440 | 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) | |||
51 | { | 51 | { |
52 | #if 0 | ||
53 | size_t index = 0; | 52 | size_t index = 0; |
@@ -55,3 +54,2 @@ QString AbstractMail::convert_String(const char*text) | |||
55 | 54 | ||
56 | qDebug("encode start %s",text); | ||
57 | /* attention - doesn't work with arm systems! */ | 55 | /* attention - doesn't work with arm systems! */ |
@@ -59,3 +57,2 @@ QString AbstractMail::convert_String(const char*text) | |||
59 | text, strlen(text),&index, "iso-8859-1",&res); | 57 | text, strlen(text),&index, "iso-8859-1",&res); |
60 | qDebug("encode end"); | ||
61 | if (err != MAILIMF_NO_ERROR) { | 58 | if (err != MAILIMF_NO_ERROR) { |
@@ -64,2 +61,3 @@ QString AbstractMail::convert_String(const char*text) | |||
64 | } | 61 | } |
62 | if (res) { | ||
65 | QString result(res); | 63 | QString result(res); |
@@ -67,5 +65,4 @@ QString AbstractMail::convert_String(const char*text) | |||
67 | return result; | 65 | return result; |
68 | #else | 66 | } |
69 | return QString(text); | 67 | return QString(text); |
70 | #endif | ||
71 | } | 68 | } |
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) | |||
280 | m->setDate(head->env_date); | 280 | m->setDate(head->env_date); |
281 | m->setSubject(head->env_subject); | 281 | m->setSubject(convert_String((const char*)head->env_subject)); |
282 | //m->setSubject(head->env_subject); | ||
282 | if (head->env_from!=NULL) { | 283 | if (head->env_from!=NULL) { |
@@ -436,3 +437,4 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
436 | if (current_address->ad_personal_name){ | 437 | if (current_address->ad_personal_name){ |
437 | from+=QString(current_address->ad_personal_name); | 438 | from+=convert_String((const char*)current_address->ad_personal_name); |
439 | //from+=QString(current_address->ad_personal_name); | ||
438 | from+=" "; | 440 | from+=" "; |