ompi fixes

6 files changed, 23 insertions, 11 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
@@ -207,5 +207,6 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
           goto free;
         }
-        
+        // LUTZ fix
+        free(wordutf8);
 	free(raw_word);
 	first = FALSE;
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;
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
@@ -76,5 +76,5 @@ bool IMAPwrapper::start_tls(bool force_tls)
 {
     int err;
-    bool try_tls;
+    bool try_tls = force_tls;
     mailimap_capability_data * cap_data = 0;
 
@@ -479,6 +479,6 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
             if ( head->env_date != NULL ) {
                 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;
                 size_t length = m->getDate().length();
@@ -498,4 +498,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                     //qDebug("%d iso %s %s ", date->dt_zone, tmp, head->env_date);
                     m->setIsoDate( QString( tmp ) );
+                    mailimf_date_time_free ( date );
                 } else {
                     m->setIsoDate(head->env_date);
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,4 +22,5 @@ Settings::Settings()
     : QObject()
 {
+    accounts.setAutoDelete( true ); ;
    updateAccounts();
    //qDebug("++++++++++++++++++new settings ");
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 8d16ae7..af5376f 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -24,4 +24,5 @@
 #include <qcursor.h>
 #include <qregexp.h>
+#include <qpe/global.h>
 
 #ifdef DESKTOP_VERSION
@@ -190,4 +191,6 @@ void OpieMail::slotSendQueued()
         return;
     }
+    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)
     {
@@ -209,11 +212,14 @@ void OpieMail::slotSendQueued()
     if (smtp)
     {
+     
+        Global::statusMessage("Sending mails...!");
         SMTPwrapper * wrap = new SMTPwrapper(smtp);
         if ( wrap->flushOutbox() )
         {
-            QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed"));
+            Global::statusMessage("Mails sent!");
         }
         delete wrap;
     }
+    // pending refresh list view, if outgoing is displayed
 }
 
@@ -431,4 +437,5 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
         item->showEntry();
     }
+    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
@@ -289,4 +289,5 @@ KPrefsWidget::KPrefsWidget(KPrefs *prefs,QWidget *parent,const char *name) :
 {
   mPrefs = prefs;
+  mPrefsWids.setAutoDelete( true );
 }