author | alwin <alwin> | 2004-10-17 12:24:39 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-10-17 12:24:39 (UTC) |
commit | 03f04b51c84b15f5b6e82a7b427adeef56c16e90 (patch) (side-by-side diff) | |
tree | a5677873f4f21c774488a84b1789e640b2fd2846 /noncore/net/mail/libmailwrapper/abstractmail.cpp | |
parent | 29719c2132c20eb92ba3e9b4e33eccfc0f89c8b4 (diff) | |
download | opie-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 (limited to 'noncore/net/mail/libmailwrapper/abstractmail.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 9 |
1 files changed, 4 insertions, 5 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 @@ -63,60 +63,59 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin int mimetype = MAILMIME_MECHANISM_7BIT; if (enc.lower()=="quoted-printable") { mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; } else if (enc.lower()=="base64") { mimetype = MAILMIME_MECHANISM_BASE64; } else if (enc.lower()=="8bit") { mimetype = MAILMIME_MECHANISM_8BIT; } else if (enc.lower()=="binary") { mimetype = MAILMIME_MECHANISM_BINARY; } 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; 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);*/ + 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); + 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() { QFile file( "/proc/sys/kernel/random/uuid" ); if (!file.open(IO_ReadOnly ) ) return QString::null; QTextStream stream(&file); return "{" + stream.read().stripWhiteSpace() + "}"; } int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) { return 0; } QString AbstractMail::defaultLocalfolder() |