encoding fixes

10 files changed, 72 insertions, 30 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index f44100b..49fd14f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -1,11 +1,11 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 
-#include <kabc/addresseedialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <kabc/addresseedialog.h>
+#include <kabc/stdaddressbook.h>
+#include <kabc/addressee.h>
 #endif //DESKTOP_VERSION
 #include <libkdepim/externalapphandler.h>
 
@@ -48,7 +48,9 @@
 ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
+
     mPickLineEdit = 0;
+    mEncoding = KOPrefs::instance()->mCurrentCodeName;
     connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
     settings = sett;
@@ -165,25 +167,25 @@ void ComposeMail::saveAsDraft()
 {
   
     Opie::Core::OSmartPointer<Mail> mail= new Mail();
-        mail->setMail(fromBox->currentText().utf8 ());
-        mail->setTo( toLine->text().utf8 () );
-        mail->setName(senderNameEdit->text().utf8 ());
-        mail->setCC( ccLine->text().utf8 () );
-        mail->setBCC( bccLine->text().utf8 () );
-        mail->setReply( replyLine->text().utf8 () );
-        mail->setSubject( subjectLine->text().utf8 () );
+        mail->setMail(fromBox->currentText());
+        mail->setTo( toLine->text() );
+        mail->setName(senderNameEdit->text());
+        mail->setCC( ccLine->text() );
+        mail->setBCC( bccLine->text() );
+        mail->setReply( replyLine->text() );
+        mail->setSubject( subjectLine->text() );
         if (!m_replyid.isEmpty()) {
             QStringList ids;
             ids.append(m_replyid);
             mail->setInreply(ids);
         }
-        QString txt = message->text().utf8 ();
+        QString txt = message->text();
         if ( !sigMultiLine->text().isEmpty() ) {
             txt.append( "\n--\n" );
             txt.append( sigMultiLine->text() );
         }
         mail->setMessage( txt );
-
+        mail->setCharset (mEncoding);
         /* only use the default drafts folder name! */
         Storemail wrapper(AbstractMail::draftFolder());
         wrapper.storeMail(mail);
@@ -408,32 +410,33 @@ void ComposeMail::accept()
     Opie::Core::OSmartPointer<Mail> mail=new Mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
-    mail->setMail(fromBox->currentText().utf8 ());
+    mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
-        mail->setTo( toLine->text().utf8 () );
+        mail->setTo( toLine->text() );
     } else {
         QMessageBox::warning(0,i18n("Sending mail"),
             i18n("No Receiver spezified" ) );
         return;
     }  
    
-    mail->setName(senderNameEdit->text().utf8 ());
-    mail->setCC( ccLine->text().utf8 () );
-    mail->setBCC( bccLine->text().utf8 () );
-    mail->setReply( replyLine->text().utf8 () );
-    mail->setSubject( subjectLine->text().utf8 () );
+    mail->setName(senderNameEdit->text());
+    mail->setCC( ccLine->text() );
+    mail->setBCC( bccLine->text() );
+    mail->setReply( replyLine->text() );
+    mail->setSubject( subjectLine->text() );
     if (!m_replyid.isEmpty()) {
         QStringList ids;
-        ids.append(m_replyid.utf8 ());
+        ids.append(m_replyid);
         mail->setInreply(ids);
     }
-    QString txt = message->text().utf8 ();
+    QString txt = message->text();
     if ( !sigMultiLine->text().isEmpty() ) {
         txt.append( "\n--\n" );
-        txt.append( sigMultiLine->text().utf8 () );
+        txt.append( sigMultiLine->text() );
     }
     mail->setMessage( txt );
+    mail->setCharset (mEncoding);
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
     while ( it != 0 ) {
         mail->addAttachment( it->getAttachment() );
@@ -476,6 +479,12 @@ void ComposeMail::reject()
     QDialog::reject();
 }
 
+void ComposeMail::setCharset(const QString& charset)
+{
+    if ( !charset.isEmpty() )
+        mEncoding = charset;
+    qDebug("ComposeMail::setCharset %s ", mEncoding.latin1());
+}
 ComposeMail::~ComposeMail()
 {
 }
@@ -483,12 +492,15 @@ ComposeMail::~ComposeMail()
 void ComposeMail::reEditMail(const RecMailP&current)
 {
     RecMailP data = current;
-    message->setText(data->Wrapper()->fetchBody(current)->Bodytext());
+    RecBodyP body = data->Wrapper()->fetchBody(current);
+
+    message->setText(body->Bodytext());
     subjectLine->setText( data->getSubject());
     toLine->setText(data->To().join(","));
     ccLine->setText(data->CC().join(","));
     bccLine->setText(data->Bcc().join(","));
     replyLine->setText(data->Replyto());
+    setCharset(body->getCharset());
 }
 
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h
index 0fc41fb..a7fa41c 100644
--- a/kmicromail/composemail.h
+++ b/kmicromail/composemail.h
@@ -48,6 +48,7 @@ public slots:
     void setInReplyTo( const QString & messageId );
     void setMessage( const QString & text );  
     void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
+    void setCharset(const QString&);
 
 
 protected slots:
@@ -74,6 +75,7 @@ protected:
     Settings *settings;
     QList<SMTPaccount> smtpAccounts;
     QString m_replyid;
+    QString mEncoding;
     bool warnAttach;
 };
 
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
@@ -226,6 +226,7 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
             if ( !charset.isEmpty() ) {
+                target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
                                                     b.latin1(), b.length(),&index, "utf-8",&resu);
                 if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
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
@@ -50,7 +50,7 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
     //qDebug("imap progress %d of %d ",current,maximum  );
     //Global::statusMessage(i18n("Downloading message %1 of %2").arg( current).arg(maximum));
     //qApp->processEvents()
-    static int last = 0;
+    static unsigned int last = 0;
     if ( last != current )
         IMAPwrapper::progress();
     last = current;
@@ -292,7 +292,7 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
                 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);
                         m->setMbox(mailbox);
                         m->setWrapper(this);
@@ -415,7 +415,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
     clistcell *current,*c,*cf;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
-    int size;
+    int size = 0;
     QBitArray mFlags(7);
     QStringList addresslist;
 
@@ -761,6 +761,7 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             qDebug("CHARSET %s ",charset.latin1() );
             //if ( false ) {
             if ( !charset.isEmpty() ) {
+                target_body->setCharset( charset );
                 //err = mailmime_encoded_phrase_parse("iso-8859-1",
                 //                                      text, strlen(text),&index, "iso-8859-1",&res);
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
@@ -1182,7 +1183,7 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
     login();
     if (!m_imap) {return 0;}
     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;
     }
     if (parentfolder) {
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
@@ -287,6 +287,7 @@ RecBody::RecBody(const RecBody&old)
     m_BodyText = old.m_BodyText;
     m_PartsList = old.m_PartsList;
     m_description = old.m_description;
+    mCharset = old.mCharset;
     // odebug << "Recbody copy constructor" << oendl; 
 }
 
@@ -330,6 +331,16 @@ const RecPartP& RecBody::Description()const
     return m_description;
 }
 
+void RecBody::setCharset(const QString& str)
+{
+    mCharset = str;
+}
+
+QString RecBody::getCharset()const
+{
+    return mCharset;
+}
+
 /* handling encoded content */
 encodedString::encodedString()
 {
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
@@ -133,6 +133,7 @@ class RecBody:public Opie::Core::ORefCount
 {
 protected:
     QString m_BodyText;
+    QString mCharset;
     QValueList<RecPartP> m_PartsList;
     RecPartP m_description;
 
@@ -142,6 +143,8 @@ public:
     virtual ~RecBody();
     void setBodytext(const QString&);
     const QString& Bodytext()const;
+    void setCharset(const QString&);
+    QString getCharset()const;
 
     void setDescription(const RecPartP&des);
     const RecPartP& Description()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
@@ -82,9 +82,12 @@ public:
     void setInreply(const QStringList&list){m_in_reply_to = list;}
     const QStringList&Inreply()const{return m_in_reply_to;}
 
+    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
@@ -7,6 +7,7 @@
 #include <qstring.h>
 
 #include <stdlib.h>
+#include <kglobal.h>
 
 using namespace Opie::Core;
 Storemail::Storemail(Account*aAccount,const QString&aFolder)
@@ -66,7 +67,14 @@ int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
 
     mailmessage * msg = 0;
     msg = mime_message_init(mimeMail);
-    mime_message_set_tmpdir(msg,getenv( "HOME" ));
+    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);
     mime_message_detach_mime(msg);
     mailmessage_free(msg);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 18a5600..c20c7ce 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -291,7 +291,7 @@ void OpieMail::replyMail()
     composer.setSubject( prefix + mail->getSubject());
     composer.setMessage( rtext );
     composer.setInReplyTo( mail->Msgid());
-
+    composer.setCharset( body->getCharset() );
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
     {
         mail->Wrapper()->answeredMail(mail);
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 4883231..3bd6f41 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -457,6 +457,7 @@ void ViewMail::slotReply()
     composer.setSubject( prefix + m_mail[1] );
     composer.setMessage( rtext );
     composer.setInReplyTo(m_recMail->Msgid());
+    composer.setCharset( m_body->getCharset()  );
 
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
     {