summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/abstractmail.cpp7
-rw-r--r--noncore/net/mail/imapwrapper.cpp6
-rw-r--r--noncore/net/mail/libmailwrapper/abstractmail.cpp7
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp6
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)
{
-#if 0
size_t index = 0;
@@ -55,3 +54,2 @@ QString AbstractMail::convert_String(const char*text)
- qDebug("encode start %s",text);
/* attention - doesn't work with arm systems! */
@@ -59,3 +57,2 @@ QString AbstractMail::convert_String(const char*text)
text, strlen(text),&index, "iso-8859-1",&res);
- qDebug("encode end");
if (err != MAILIMF_NO_ERROR) {
@@ -64,2 +61,3 @@ QString AbstractMail::convert_String(const char*text)
}
+ if (res) {
QString result(res);
@@ -67,5 +65,4 @@ QString AbstractMail::convert_String(const char*text)
return result;
-#else
+ }
return QString(text);
-#endif
}
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,3 +54,2 @@ QString AbstractMail::convert_String(const char*text)
- qDebug("encode start %s",text);
/* attention - doesn't work with arm systems! */
@@ -59,3 +57,2 @@ QString AbstractMail::convert_String(const char*text)
text, strlen(text),&index, "iso-8859-1",&res);
- qDebug("encode end");
if (err != MAILIMF_NO_ERROR) {
@@ -64,2 +61,3 @@ QString AbstractMail::convert_String(const char*text)
}
+ if (res) {
QString result(res);
@@ -67,5 +65,4 @@ QString AbstractMail::convert_String(const char*text)
return result;
-#else
+ }
return QString(text);
-#endif
}
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+=" ";