encoding fixes

6 files changed, 35 insertions, 8 deletions

diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 49227dd..28d45ce 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -228,2 +228,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             if ( !charset.isEmpty() ) {
+                target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index eb2b47d..2a54381 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -52,3 +52,3 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
     //qApp->processEvents()
-    static int last = 0;
+    static unsigned int last = 0;
     if ( last != current )
@@ -291,6 +291,6 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
                 //qDebug("iii %d ",i);
-                msg_att = (mailimap_msg_att*)current->data;
+                msg_att = (mailimap_msg_att*)current->data; 
                 RecMail*m = parse_list_result(msg_att);
                 if (m) {
-                    if ( maxSizeInKb == 0 || m->Msgsize()<=maxSizeInKb*1024 ) { 
+                    if ( maxSizeInKb == 0 || m->Msgsize()<=(unsigned int ) maxSizeInKb*1024 ) { 
                         m->setNumber(i);
@@ -417,3 +417,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
     mailimap_flag_fetch*cflag;
-    int size;
+    int size = 0;
     QBitArray mFlags(7);
@@ -763,2 +763,3 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             if ( !charset.isEmpty() ) {
+                target_body->setCharset( charset );
                 //err = mailmime_encoded_phrase_parse("iso-8859-1",
@@ -1184,3 +1185,3 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
     QString pre = account->getPrefix();
-    if (delemiter.length()>0 && pre.findRev(delemiter)!=pre.length()-1) {
+    if (delemiter.length()>0 && pre.findRev(delemiter)!=((int)pre.length())-1) {
         pre+=delemiter;
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp
index af3b9d0..89150ad 100644
--- a/kmicromail/libmailwrapper/mailtypes.cpp
+++ b/kmicromail/libmailwrapper/mailtypes.cpp
@@ -289,2 +289,3 @@ RecBody::RecBody(const RecBody&old)
     m_description = old.m_description;
+    mCharset = old.mCharset;
     // odebug << "Recbody copy constructor" << oendl; 
@@ -332,2 +333,12 @@ const RecPartP& RecBody::Description()const
 
+void RecBody::setCharset(const QString& str)
+{
+    mCharset = str;
+}
+
+QString RecBody::getCharset()const
+{
+    return mCharset;
+}
+
 /* handling encoded content */
diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h
index c1c1a74..32d92c0 100644
--- a/kmicromail/libmailwrapper/mailtypes.h
+++ b/kmicromail/libmailwrapper/mailtypes.h
@@ -135,2 +135,3 @@ protected:
     QString m_BodyText;
+    QString mCharset;
     QValueList<RecPartP> m_PartsList;
@@ -144,2 +145,4 @@ public:
     const QString& Bodytext()const;
+    void setCharset(const QString&);
+    QString getCharset()const;
 
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index 88f10da..ea6bf36 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -84,5 +84,8 @@ public:
 
+    void setCharset( const QString&a ) { charset= a; }
+    const QString& getCharset() { return charset; }
+
 private:
     QList<Attachment> attList;
-    QString name, mail, to, cc, bcc, reply, subject, message;
+    QString name, mail, to, cc, bcc, reply, subject, message, charset;
     QStringList m_in_reply_to;
diff --git a/kmicromail/libmailwrapper/storemail.cpp b/kmicromail/libmailwrapper/storemail.cpp
index ed1d44a..9d1735f 100644
--- a/kmicromail/libmailwrapper/storemail.cpp
+++ b/kmicromail/libmailwrapper/storemail.cpp
@@ -9,2 +9,3 @@
 #include <stdlib.h>
+#include <kglobal.h>
 
@@ -67,4 +68,11 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
     mailmessage * msg = 0;
-    msg = mime_message_init(mimeMail);
-    mime_message_set_tmpdir(msg,getenv( "HOME" ));
+    msg = mime_message_init(mimeMail); 
+    QString fileName;
+#ifdef DESKTOP_VERSION
+    fileName = locateLocal("tmp", "");
+#else
+    fileName = "/tmp/";
+#endif
+    //mime_message_set_tmpdir(msg,getenv( "HOME" ));
+    mime_message_set_tmpdir(msg,(char*)fileName.latin1());
     int r = mailmessage_fetch(msg,&data,&size);