author | alwin <alwin> | 2004-10-28 23:10:00 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-10-28 23:10:00 (UTC) |
commit | 35262b3fbc09b32d4c5b20004f755e0c5651dc1b (patch) (unidiff) | |
tree | 09c4aa49be5a09afb68b4f94afa756c7fa7f5b01 /noncore/net | |
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 | |||
67 | mimetype = MAILMIME_MECHANISM_BASE64; | 67 | mimetype = MAILMIME_MECHANISM_BASE64; |
68 | } else if (enc.lower()=="8bit") { | 68 | } else if (enc.lower()=="8bit") { |
69 | mimetype = MAILMIME_MECHANISM_8BIT; | 69 | mimetype = MAILMIME_MECHANISM_8BIT; |
70 | } else if (enc.lower()=="binary") { | 70 | } else if (enc.lower()=="binary") { |
71 | mimetype = MAILMIME_MECHANISM_BINARY; | 71 | mimetype = MAILMIME_MECHANISM_BINARY; |
72 | } | 72 | } |
73 | 73 | ||
74 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 74 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
75 | &result_text,&target_length); | 75 | &result_text,&target_length); |
76 | 76 | ||
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 | if (!text) { | ||
92 | return QString(""); | ||
93 | } | ||
91 | QString result(text); | 94 | QString result(text); |
92 | 95 | ||
93 | err = mailmime_encoded_phrase_parse("iso-8859-1", | 96 | err = mailmime_encoded_phrase_parse("iso-8859-1", |
94 | text, strlen(text),&index, "iso-8859-1",&res); | 97 | text, strlen(text),&index, "iso-8859-1",&res); |
95 | //odebug << "Input: " << text << "" << oendl; | 98 | //odebug << "Input: " << text << "" << oendl; |
96 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 99 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
97 | result = QString(res); | 100 | result = QString(res); |
98 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; | 101 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; |
99 | } | 102 | } |
100 | if (res) free(res); | 103 | if (res) free(res); |
101 | return result; | 104 | return result; |
102 | } | 105 | } |
103 | 106 | ||
104 | /* cp & paste from launcher */ | 107 | /* cp & paste from launcher */ |
105 | QString AbstractMail::gen_attachment_id() | 108 | QString AbstractMail::gen_attachment_id() |
106 | { | 109 | { |
107 | QFile file( "/proc/sys/kernel/random/uuid" ); | 110 | QFile file( "/proc/sys/kernel/random/uuid" ); |
108 | if (!file.open(IO_ReadOnly ) ) | 111 | if (!file.open(IO_ReadOnly ) ) |
109 | return QString::null; | 112 | return QString::null; |
110 | 113 | ||
111 | QTextStream stream(&file); | 114 | QTextStream stream(&file); |
112 | 115 | ||
113 | return "{" + stream.read().stripWhiteSpace() + "}"; | 116 | return "{" + stream.read().stripWhiteSpace() + "}"; |
114 | } | 117 | } |