ompi fixes

3 files changed, 13 insertions, 10 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 )
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index ae667ec..d90a8d2 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -77,3 +77,3 @@ bool IMAPwrapper::start_tls(bool force_tls)
     int err;
-    bool try_tls;
+    bool try_tls = force_tls;
     mailimap_capability_data * cap_data = 0;
@@ -480,4 +480,4 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                 m->setDate(head->env_date);
-                struct mailimf_date_time result; 
-                struct mailimf_date_time* date = &result;
+                //struct mailimf_date_time result; 
+                struct mailimf_date_time* date;// = &result;
                 struct mailimf_date_time **re = &date;
@@ -499,2 +499,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                     m->setIsoDate( QString( tmp ) );
+                    mailimf_date_time_free ( date );
                 } else {
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 5d2c0ad..04afe7c 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -22,3 +22,4 @@ Settings::Settings()
     : QObject()
-{
+{  
+    accounts.setAutoDelete( true ); ;
    updateAccounts();