ompi fixes

6 files changed, 25 insertions, 13 deletions

diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c
index e48ec19..dbaeb68 100644
--- a/kmicromail/libetpan/mime/mailmime_decode.c
+++ b/kmicromail/libetpan/mime/mailmime_decode.c
@@ -208,3 +208,4 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
         }
-        
+        // LUTZ fix
+        free(wordutf8);
 	free(raw_word);
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();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 8d16ae7..af5376f 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -25,2 +25,3 @@
 #include <qregexp.h>
+#include <qpe/global.h>
 
@@ -191,2 +192,4 @@ void OpieMail::slotSendQueued()
     }
+    if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+        return;
     if (smtpList.count()==1)
@@ -210,2 +213,4 @@ void OpieMail::slotSendQueued()
     {
+     
+        Global::statusMessage("Sending mails...!");
         SMTPwrapper * wrap = new SMTPwrapper(smtp);
@@ -213,6 +218,7 @@ void OpieMail::slotSendQueued()
         {
-            QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed"));
-        }
+            Global::statusMessage("Mails sent!");
+        } 
         delete wrap;
     }
+    // pending refresh list view, if outgoing is displayed
 }
@@ -432,2 +438,3 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
     }
+    mailView->setSorting ( 4, false );
 }
diff --git a/libkdepim/kprefswidget.cpp b/libkdepim/kprefswidget.cpp
index be9ad30..f6a0b38 100644
--- a/libkdepim/kprefswidget.cpp
+++ b/libkdepim/kprefswidget.cpp
@@ -290,2 +290,3 @@ KPrefsWidget::KPrefsWidget(KPrefs *prefs,QWidget *parent,const char *name) :
   mPrefs = prefs;
+  mPrefsWids.setAutoDelete( true );
 }