summaryrefslogtreecommitdiffabout
path: root/kmicromail
authorzautrix <zautrix>2004-11-01 14:15:56 (UTC)
committer zautrix <zautrix>2004-11-01 14:15:56 (UTC)
commit3320af5e47cdb4b54c4185c91d0332c013d90818 (patch) (side-by-side diff)
tree9d7db42d4350616d315c5f95e1ac0aed00ed1314 /kmicromail
parent56845a3ee7013af8a2db26a89aa151ee482ef0ed (diff)
downloadkdepimpi-3320af5e47cdb4b54c4185c91d0332c013d90818.zip
kdepimpi-3320af5e47cdb4b54c4185c91d0332c013d90818.tar.gz
kdepimpi-3320af5e47cdb4b54c4185c91d0332c013d90818.tar.bz2
ompi fixes
Diffstat (limited to 'kmicromail') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/libetpan/mime/mailmime_decode.c3
-rw-r--r--kmicromail/libmailwrapper/generatemail.cpp13
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp7
-rw-r--r--kmicromail/libmailwrapper/settings.cpp1
-rw-r--r--kmicromail/opiemail.cpp9
5 files changed, 22 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
@@ -206,7 +206,8 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
res = MAILIMF_ERROR_MEMORY;
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
@@ -9,7 +9,7 @@
#include <qfileinfo.h>
using namespace Opie::Core;
-const char* Generatemail::USER_AGENT="OpieMail v0.6";
+const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
Generatemail::Generatemail()
{
@@ -132,7 +132,6 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
char*name = 0;
char*file = 0;
int err;
-
int pos = filename.findRev( '/' );
if (filename.length()>0) {
@@ -171,7 +170,7 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
if (filename.length()>0) {
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) {
qDebug("Error setting body with file ");
@@ -227,7 +226,7 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
mailmime_content *content;
mailmime_parameter *param;
int err;
-
+ QCString __str;
param = mailmime_parameter_new( strdup( "charset" ),
strdup( "iso-8859-1" ) );
if ( param == NULL )
@@ -248,8 +247,10 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
txtPart = mailmime_new_empty( content, fields );
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
@@ -75,7 +75,7 @@ void IMAPwrapper::progress( QString m )
bool IMAPwrapper::start_tls(bool force_tls)
{
int err;
- bool try_tls;
+ bool try_tls = force_tls;
mailimap_capability_data * cap_data = 0;
err = mailimap_capability(m_imap,&cap_data);
@@ -478,8 +478,8 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
continue;
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();
size_t index = 0;
@@ -497,6 +497,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
dt.date().year(),dt.date().month(), dt.date().day(), dt.time().hour(), dt.time().minute(), dt.time().second() );
//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
@@ -21,6 +21,7 @@
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
@@ -23,6 +23,7 @@
#include <qtimer.h>
#include <qcursor.h>
#include <qregexp.h>
+#include <qpe/global.h>
#ifdef DESKTOP_VERSION
#include <qapplication.h>
@@ -189,6 +190,8 @@ void OpieMail::slotSendQueued()
QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
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)
{
smtp = smtpList.at(0);
@@ -208,13 +211,16 @@ 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
}
void OpieMail::slotSearchMails()
@@ -430,6 +436,7 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
item->storeData((*it));
item->showEntry();
}
+ mailView->setSorting ( 4, false );
}
void OpieMail::mailLeftClicked( QListViewItem *item )