summaryrefslogtreecommitdiff
authoralwin <alwin>2004-10-17 12:24:39 (UTC)
committer alwin <alwin>2004-10-17 12:24:39 (UTC)
commit03f04b51c84b15f5b6e82a7b427adeef56c16e90 (patch) (side-by-side diff)
treea5677873f4f21c774488a84b1789e640b2fd2846
parent29719c2132c20eb92ba3e9b4e33eccfc0f89c8b4 (diff)
downloadopie-03f04b51c84b15f5b6e82a7b427adeef56c16e90.zip
opie-03f04b51c84b15f5b6e82a7b427adeef56c16e90.tar.gz
opie-03f04b51c84b15f5b6e82a7b427adeef56c16e90.tar.bz2
the bug in libetpan seems to be fixed so we can reuse string encoding again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/abstractmail.cpp17
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
@@ -49,17 +49,17 @@ AbstractMail* AbstractMail::getWrapper(Account*a)
break;
default:
return 0;
}
}
encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
{
- odebug << "Decode string start" << oendl;
+ odebug << "Decode string start" << oendl;
char*result_text;
size_t index = 0;
/* reset for recursive use! */
size_t target_length = 0;
result_text = 0;
int mimetype = MAILMIME_MECHANISM_7BIT;
if (enc.lower()=="quoted-printable") {
mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
@@ -73,35 +73,34 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype,
&result_text,&target_length);
encodedString* result = new encodedString();
if (err == MAILIMF_NO_ERROR) {
result->setContent(result_text,target_length);
}
- odebug << "Decode string finished" << oendl;
+ 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);
+ //odebug << "Input: " << text << "" << oendl;
if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
-// result = QString(res);
-// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
+ result = QString(res);
+// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
}
if (res) free(res);
return result;
}
/* cp & paste from launcher */
QString AbstractMail::gen_attachment_id()
{