-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 17 |
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) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) | 55 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) |
56 | { | 56 | { |
57 | odebug << "Decode string start" << oendl; | 57 | odebug << "Decode string start" << oendl; |
58 | char*result_text; | 58 | char*result_text; |
59 | size_t index = 0; | 59 | size_t index = 0; |
60 | /* reset for recursive use! */ | 60 | /* reset for recursive use! */ |
61 | size_t target_length = 0; | 61 | size_t target_length = 0; |
@@ -77,27 +77,26 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
77 | encodedString* result = new encodedString(); | 77 | encodedString* result = new encodedString(); |
78 | if (err == MAILIMF_NO_ERROR) { | 78 | if (err == MAILIMF_NO_ERROR) { |
79 | result->setContent(result_text,target_length); | 79 | result->setContent(result_text,target_length); |
80 | } | 80 | } |
81 | odebug << "Decode string finished" << oendl; | 81 | odebug << "Decode string finished" << oendl; |
82 | return result; | 82 | return result; |
83 | } | 83 | } |
84 | 84 | ||
85 | QString AbstractMail::convert_String(const char*text) | 85 | QString AbstractMail::convert_String(const char*text) |
86 | { | 86 | { |
87 | //size_t index = 0; | 87 | size_t index = 0; |
88 | char*res = 0; | 88 | char*res = 0; |
89 | int err = MAILIMF_NO_ERROR; | 89 | int err = MAILIMF_NO_ERROR; |
90 | 90 | ||
91 | QString result(text); | 91 | QString result(text); |
92 | 92 | ||
93 | /* due a bug in libetpan it isn't usable this moment */ | 93 | err = mailmime_encoded_phrase_parse("iso-8859-1", |
94 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 94 | text, strlen(text),&index, "iso-8859-1",&res); |
95 | text, strlen(text),&index, "iso-8859-1",&res);*/ | 95 | //odebug << "Input: " << text << "" << oendl; |
96 | //odebug << "Input: " << text << "" << oendl; | ||
97 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 96 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
98 | // result = QString(res); | 97 | result = QString(res); |
99 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; | 98 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; |
100 | } | 99 | } |
101 | if (res) free(res); | 100 | if (res) free(res); |
102 | return result; | 101 | return result; |
103 | } | 102 | } |