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
@@ -11,3 +11,3 @@
 using namespace Opie::Core;
-const char* Generatemail::USER_AGENT="OpieMail v0.6";
+const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 
@@ -134,3 +134,2 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
     int err;
-
     int pos = filename.findRev( '/' );
@@ -173,3 +172,3 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
         } else {
-            err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
         }
@@ -229,3 +228,3 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     int err;
-
+    QCString __str;
     param = mailmime_parameter_new( strdup( "charset" ),
@@ -250,4 +249,6 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
         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 )