author | alwin <alwin> | 2004-10-28 23:10:00 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-10-28 23:10:00 (UTC) |
commit | 35262b3fbc09b32d4c5b20004f755e0c5651dc1b (patch) (side-by-side diff) | |
tree | 09c4aa49be5a09afb68b4f94afa756c7fa7f5b01 /noncore | |
parent | 20992991cdc3116edbaedbbc58ba607f453acdbc (diff) | |
download | opie-35262b3fbc09b32d4c5b20004f755e0c5651dc1b.zip opie-35262b3fbc09b32d4c5b20004f755e0c5651dc1b.tar.gz opie-35262b3fbc09b32d4c5b20004f755e0c5651dc1b.tar.bz2 |
small bugfix in converting routine
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index f40aac8..5a8ada6 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp @@ -67,48 +67,51 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin 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; char*res = 0; int err = MAILIMF_NO_ERROR; + if (!text) { + return QString(""); + } QString result(text); 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; } 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() + "}"; } |