author | zautrix <zautrix> | 2004-10-16 10:18:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-16 10:18:46 (UTC) |
commit | 023b3c542a6dd4d1c4b53dba6bb2c68f605a7917 (patch) (unidiff) | |
tree | 96929f98d9de314dc48f0a89efa5d93a78644a3d /kmicromail/libmailwrapper | |
parent | 2897677d61fd8d33355611b5b951e2bee1136b9c (diff) | |
download | kdepimpi-023b3c542a6dd4d1c4b53dba6bb2c68f605a7917.zip kdepimpi-023b3c542a6dd4d1c4b53dba6bb2c68f605a7917.tar.gz kdepimpi-023b3c542a6dd4d1c4b53dba6bb2c68f605a7917.tar.bz2 |
umlaut fix for ompi
-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 12 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 673f288..2d7533c 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -87,26 +87,24 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
87 | //odebug << "Decode string finished" << oendl; | 87 | //odebug << "Decode string finished" << oendl; |
88 | return result; | 88 | return result; |
89 | } | 89 | } |
90 | 90 | ||
91 | QString AbstractMail::convert_String(const char*text) | 91 | QString AbstractMail::convert_String(const char*text) |
92 | { | 92 | { |
93 | //size_t index = 0; | 93 | size_t index = 0; |
94 | char*res = 0; | 94 | char*res = 0; |
95 | int err = MAILIMF_NO_ERROR; | 95 | int err = MAILIMF_NO_ERROR; |
96 | 96 | ||
97 | QString result(text); | 97 | QString result(text); |
98 | 98 | ||
99 | /* due a bug in libetpan it isn't usable this moment */ | 99 | err = mailmime_encoded_phrase_parse("iso-8859-1", |
100 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 100 | text, strlen(text),&index, "iso-8859-1",&res); |
101 | text, strlen(text),&index, "iso-8859-1",&res);*/ | ||
102 | //odebug << "Input: " << text << "" << oendl; | ||
103 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 101 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
104 | // result = QString(res); | 102 | result = QString(res); |
105 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; | ||
106 | } | 103 | } |
104 | //qDebug("convert_String:%s ",result.latin1() ); | ||
107 | if (res) free(res); | 105 | if (res) free(res); |
108 | return result; | 106 | return result; |
109 | } | 107 | } |
110 | 108 | ||
111 | /* cp & paste from launcher */ | 109 | /* cp & paste from launcher */ |
112 | QString AbstractMail::gen_attachment_id() | 110 | QString AbstractMail::gen_attachment_id() |
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index e691082..d89a5f9 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp | |||
@@ -275,17 +275,17 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
278 | RecBodyP Genericwrapper::parseMail( mailmessage * msg ) | 278 | RecBodyP Genericwrapper::parseMail( mailmessage * msg ) |
279 | { | 279 | { |
280 | int err = MAILIMF_NO_ERROR; | 280 | int err = MAILIMF_NO_ERROR; |
281 | mailmime_single_fields fields; | 281 | //mailmime_single_fields fields; |
282 | /* is bound to msg and will be freed there */ | 282 | /* is bound to msg and will be freed there */ |
283 | mailmime * mime=0; | 283 | mailmime * mime=0; |
284 | RecBodyP body = new RecBody(); | 284 | RecBodyP body = new RecBody(); |
285 | memset(&fields, 0, sizeof(struct mailmime_single_fields)); | 285 | //memset(&fields, 0, sizeof(struct mailmime_single_fields)); |
286 | err = mailmessage_get_bodystructure(msg,&mime); | 286 | err = mailmessage_get_bodystructure(msg,&mime); |
287 | QValueList<int>recList; | 287 | QValueList<int>recList; |
288 | traverseBody(body,msg,mime,recList); | 288 | traverseBody(body,msg,mime,recList); |
289 | return body; | 289 | return body; |
290 | } | 290 | } |
291 | 291 | ||