ompi fixes

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 @@
 
 using namespace Opie::Core;
-const char* Generatemail::USER_AGENT="OpieMail v0.6";
+const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 
 Generatemail::Generatemail()
@@ -133,5 +133,4 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
     char*file = 0;
     int err;
-
     int pos = filename.findRev( '/' );
 
@@ -172,5 +171,5 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
         }
         if (err != MAILIMF_NO_ERROR) {
@@ -228,5 +227,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     mailmime_parameter *param;
     int err;
-
+    QCString __str;
     param = mailmime_parameter_new( strdup( "charset" ),
                                     strdup( "iso-8859-1" ) );
@@ -249,6 +248,8 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     if ( txtPart == NULL )
         goto err_free_fields;
-
-    err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
+    {
+        __str = str.utf8();
+        err = mailmime_set_body_text( txtPart, __str.data(), __str.length() );
+    }
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;