Diffstat (limited to 'kmicromail/libmailwrapper/generatemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/generatemail.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp index 49315ba..32311d7 100644 --- a/kmicromail/libmailwrapper/generatemail.cpp +++ b/kmicromail/libmailwrapper/generatemail.cpp | |||
@@ -10,5 +10,5 @@ | |||
10 | 10 | ||
11 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
12 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; | 12 | const char* Generatemail::USER_AGENT="KOpieMail 33 1/3"; |
13 | 13 | ||
14 | Generatemail::Generatemail() | 14 | Generatemail::Generatemail() |
@@ -133,5 +133,4 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
133 | char*file = 0; | 133 | char*file = 0; |
134 | int err; | 134 | int err; |
135 | |||
136 | int pos = filename.findRev( '/' ); | 135 | int pos = filename.findRev( '/' ); |
137 | 136 | ||
@@ -172,5 +171,5 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet | |||
172 | err = mailmime_set_body_file( filePart, file ); | 171 | err = mailmime_set_body_file( filePart, file ); |
173 | } else { | 172 | } else { |
174 | err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length()); | 173 | err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length()); |
175 | } | 174 | } |
176 | if (err != MAILIMF_NO_ERROR) { | 175 | if (err != MAILIMF_NO_ERROR) { |
@@ -228,5 +227,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { | |||
228 | mailmime_parameter *param; | 227 | mailmime_parameter *param; |
229 | int err; | 228 | int err; |
230 | 229 | QCString __str; | |
231 | param = mailmime_parameter_new( strdup( "charset" ), | 230 | param = mailmime_parameter_new( strdup( "charset" ), |
232 | strdup( "iso-8859-1" ) ); | 231 | strdup( "iso-8859-1" ) ); |
@@ -249,6 +248,8 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { | |||
249 | if ( txtPart == NULL ) | 248 | if ( txtPart == NULL ) |
250 | goto err_free_fields; | 249 | goto err_free_fields; |
251 | 250 | { | |
252 | err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() ); | 251 | __str = str.utf8(); |
252 | err = mailmime_set_body_text( txtPart, __str.data(), __str.length() ); | ||
253 | } | ||
253 | if ( err != MAILIMF_NO_ERROR ) | 254 | if ( err != MAILIMF_NO_ERROR ) |
254 | goto err_free_txtPart; | 255 | goto err_free_txtPart; |