| -rw-r--r-- | kmicromail/libmailwrapper/generatemail.cpp | 16 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/generatemail.h | 1 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 3 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 4 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp index 32311d7..2d213fe 100644 --- a/kmicromail/libmailwrapper/generatemail.cpp +++ b/kmicromail/libmailwrapper/generatemail.cpp @@ -15,2 +15,3 @@ Generatemail::Generatemail() { + mCharset = "iso-8859-1"; } @@ -147,3 +148,3 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet param = mailmime_parameter_new( strdup( "charset" ), - strdup( "iso-8859-1" ) ); + strdup( mCharset.latin1() ) ); mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE; @@ -172,3 +173,4 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet } else { - err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length()); + err = mailmime_set_body_text(filePart,strdup( TextContent.utf8().data()),TextContent.utf8().length()); + //err = mailmime_set_body_text(filePart,strdup( TextContent.latin1()),TextContent.length()); } @@ -229,4 +231,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { QCString __str; + //qDebug(" Generatemail::buildTxtPart %s", str.latin1()); param = mailmime_parameter_new( strdup( "charset" ), - strdup( "iso-8859-1" ) ); + strdup( mCharset.latin1() ) ); if ( param == NULL ) @@ -250,4 +253,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { { - __str = str.utf8(); - err = mailmime_set_body_text( txtPart, __str.data(), __str.length() ); + //__str = str.utf8(); + __str = QCString (str.latin1()); + err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() ); } @@ -400,2 +404,4 @@ mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &ma + //LR disabled for now + //mCharset = mail->getCharset().lower(); fields = createImfFields( mail ); diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h index b9f8285..a9fb648 100644 --- a/kmicromail/libmailwrapper/generatemail.h +++ b/kmicromail/libmailwrapper/generatemail.h @@ -44,2 +44,3 @@ protected: static const char* USER_AGENT; + QString mCharset; }; diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 28d45ce..eac05e5 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp @@ -227,3 +227,4 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m qDebug("CHARSET %s ",charset.latin1() ); - if ( !charset.isEmpty() ) { + if (false ) { + //if ( !charset.isEmpty() ) { target->setCharset( charset ); diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index 2a54381..da7065f 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp @@ -761,4 +761,4 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t qDebug("CHARSET %s ",charset.latin1() ); - //if ( false ) { - if ( !charset.isEmpty() ) { + if ( false ) { + //if ( !charset.isEmpty() ) { target_body->setCharset( charset ); diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h index ea6bf36..3e8b51f 100644 --- a/kmicromail/libmailwrapper/mailwrapper.h +++ b/kmicromail/libmailwrapper/mailwrapper.h @@ -85,3 +85,3 @@ public: void setCharset( const QString&a ) { charset= a; } - const QString& getCharset() { return charset; } + const QString& getCharset() const { return charset; } |