nothing much.

just only check in my tries to finish the pop3 stuff
and found another bug inside libetpan.
when decoding text with fun "mailmime_encoded_phrase_parse" it
works fine on i386 machines but not on arm (segmentation fault inside
this fun) - it has to be resolved.

6 files changed, 130 insertions, 16 deletions

diff --git a/noncore/net/mail/abstractmail.cpp b/noncore/net/mail/abstractmail.cpp
index 92a46f1..b7e5eaa 100644
--- a/noncore/net/mail/abstractmail.cpp
+++ b/noncore/net/mail/abstractmail.cpp
@@ -47,2 +47,25 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
     return result;
 }
+
+QString AbstractMail::convert_String(const char*text)
+{
+#if 0
+    size_t index = 0;
+    char*res = 0;
+   
+        qDebug("encode start %s",text); 
+        /* attention - doesn't work with arm systems! */
+    int err = mailmime_encoded_phrase_parse("iso-8859-1",
+        text, strlen(text),&index, "iso-8859-1",&res);
+        qDebug("encode end"); 
+    if (err != MAILIMF_NO_ERROR) {
+        if (res) free(res);
+        return QString(text);
+    }
+    QString result(res);
+    free(res);
+    return result;
+#else
+        return QString(text);
+#endif
+}
diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h
index f1a8468..c16e9c0 100644
--- a/noncore/net/mail/abstractmail.h
+++ b/noncore/net/mail/abstractmail.h
@@ -32,4 +32,5 @@ public:
     static AbstractMail* getWrapper(POP3account *a);
     static encodedString*decode_String(const encodedString*text,const QString&enc);
+    static QString convert_String(const char*text);
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 92a46f1..b7e5eaa 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -47,2 +47,25 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
     return result;
 }
+
+QString AbstractMail::convert_String(const char*text)
+{
+#if 0
+    size_t index = 0;
+    char*res = 0;
+   
+        qDebug("encode start %s",text); 
+        /* attention - doesn't work with arm systems! */
+    int err = mailmime_encoded_phrase_parse("iso-8859-1",
+        text, strlen(text),&index, "iso-8859-1",&res);
+        qDebug("encode end"); 
+    if (err != MAILIMF_NO_ERROR) {
+        if (res) free(res);
+        return QString(text);
+    }
+    QString result(res);
+    free(res);
+    return result;
+#else
+        return QString(text);
+#endif
+}
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index f1a8468..c16e9c0 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -32,4 +32,5 @@ public:
     static AbstractMail* getWrapper(POP3account *a);
     static encodedString*decode_String(const encodedString*text,const QString&enc);
+    static QString convert_String(const char*text);
 };
 #endif
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 30f80ff..22a4c70 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -4,6 +4,10 @@
 #include <libetpan/mailpop3.h>
 #include <libetpan/mailmime.h>
+#include <libetpan/data_message_driver.h>
 #include <qfile.h>
 
+/* we don't fetch messages larger than 5 MB */
+#define HARD_MSG_SIZE_LIMIT 5242880
+
 POP3wrapper::POP3wrapper( POP3account *a )
 {
@@ -38,8 +42,13 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
         return RecBody();
     }
+
     RecBody body;
     
     QFile msg_cache(msgTempName);
 
+    if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) {
+        qDebug("Message to large: %i",mail.Msgsize());
+        return body;
+    }
     if (mail.getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
@@ -80,4 +89,8 @@ RecBody POP3wrapper::parseMail( char *message )
     size_t curTok = 0;
     mailimf_message *result = 0;
+    mailmessage * msg=0;
+    struct mailmime * mime=0;
+    struct mailmime_single_fields fields;
+
     RecBody body;
 
@@ -88,9 +101,29 @@ RecBody POP3wrapper::parseMail( char *message )
         return body;
     }
-    
-    struct mailimf_body * b = 0;
-    struct mailimf_fields * f = 0;
-    
-    
+
+#if 0
+    char*body_msg = message;
+    if ( result && result->msg_body && result->msg_body->bd_text ) {
+        body_msg = (char*)result->msg_body->bd_text;
+        result->msg_body->bd_text = 0;
+    }
+
+    msg = mailmessage_new();
+    mailmessage_init(msg, NULL, data_message_driver, 0, strlen(body_msg));
+    generic_message_t * msg_data;
+    msg_data = (generic_message_t *)msg->msg_data;
+    msg_data->msg_fetched = 1;
+    msg_data->msg_message = body_msg;
+    msg_data->msg_length = strlen(body_msg);
+    memset(&fields, 0, sizeof(struct mailmime_single_fields));
+    err = mailmessage_get_bodystructure(msg,&mime);
+
+    if (mime->mm_mime_fields != NULL) {
+        mailmime_single_fields_init(&fields, mime->mm_mime_fields,
+            mime->mm_content_type);
+    }
+#endif
+
+#if 1
     if ( result && result->msg_body && result->msg_body->bd_text ) {
         qDebug( "POP3: bodytext found" );
@@ -109,4 +142,5 @@ RecBody POP3wrapper::parseMail( char *message )
         mailimf_message_free(result);
     }
+#endif
     return body;
 }
@@ -173,5 +207,5 @@ RecMail *POP3wrapper::parseHeader( const char *header )
                 break;
             case MAILIMF_FIELD_SUBJECT:
-                mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
+                mail->setSubject(convert_String( field->fld_data.fld_subject->sbj_value ) );
                 break;
             case MAILIMF_FIELD_ORIG_DATE:
@@ -204,5 +238,4 @@ RecMail *POP3wrapper::parseHeader( const char *header )
                     qDebug("X-Status: %s",value.latin1());
                     if (value.lower()=="a") {
-                        
                         mFlags.setBit(FLAG_ANSWERED);
                     }
@@ -285,5 +318,5 @@ QString POP3wrapper::parseMailbox( mailimf_mailbox *box )
         result.append( box->mb_addr_spec );
     } else {
-        result.append( box->mb_display_name );
+        result.append( convert_String(box->mb_display_name).latin1() );
         result.append( " <" );
         result.append( box->mb_addr_spec );
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 30f80ff..22a4c70 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -4,6 +4,10 @@
 #include <libetpan/mailpop3.h>
 #include <libetpan/mailmime.h>
+#include <libetpan/data_message_driver.h>
 #include <qfile.h>
 
+/* we don't fetch messages larger than 5 MB */
+#define HARD_MSG_SIZE_LIMIT 5242880
+
 POP3wrapper::POP3wrapper( POP3account *a )
 {
@@ -38,8 +42,13 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
         return RecBody();
     }
+
     RecBody body;
     
     QFile msg_cache(msgTempName);
 
+    if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) {
+        qDebug("Message to large: %i",mail.Msgsize());
+        return body;
+    }
     if (mail.getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
@@ -80,4 +89,8 @@ RecBody POP3wrapper::parseMail( char *message )
     size_t curTok = 0;
     mailimf_message *result = 0;
+    mailmessage * msg=0;
+    struct mailmime * mime=0;
+    struct mailmime_single_fields fields;
+
     RecBody body;
 
@@ -88,9 +101,29 @@ RecBody POP3wrapper::parseMail( char *message )
         return body;
     }
-    
-    struct mailimf_body * b = 0;
-    struct mailimf_fields * f = 0;
-    
-    
+
+#if 0
+    char*body_msg = message;
+    if ( result && result->msg_body && result->msg_body->bd_text ) {
+        body_msg = (char*)result->msg_body->bd_text;
+        result->msg_body->bd_text = 0;
+    }
+
+    msg = mailmessage_new();
+    mailmessage_init(msg, NULL, data_message_driver, 0, strlen(body_msg));
+    generic_message_t * msg_data;
+    msg_data = (generic_message_t *)msg->msg_data;
+    msg_data->msg_fetched = 1;
+    msg_data->msg_message = body_msg;
+    msg_data->msg_length = strlen(body_msg);
+    memset(&fields, 0, sizeof(struct mailmime_single_fields));
+    err = mailmessage_get_bodystructure(msg,&mime);
+
+    if (mime->mm_mime_fields != NULL) {
+        mailmime_single_fields_init(&fields, mime->mm_mime_fields,
+            mime->mm_content_type);
+    }
+#endif
+
+#if 1
     if ( result && result->msg_body && result->msg_body->bd_text ) {
         qDebug( "POP3: bodytext found" );
@@ -109,4 +142,5 @@ RecBody POP3wrapper::parseMail( char *message )
         mailimf_message_free(result);
     }
+#endif
     return body;
 }
@@ -173,5 +207,5 @@ RecMail *POP3wrapper::parseHeader( const char *header )
                 break;
             case MAILIMF_FIELD_SUBJECT:
-                mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
+                mail->setSubject(convert_String( field->fld_data.fld_subject->sbj_value ) );
                 break;
             case MAILIMF_FIELD_ORIG_DATE:
@@ -204,5 +238,4 @@ RecMail *POP3wrapper::parseHeader( const char *header )
                     qDebug("X-Status: %s",value.latin1());
                     if (value.lower()=="a") {
-                        
                         mFlags.setBit(FLAG_ANSWERED);
                     }
@@ -285,5 +318,5 @@ QString POP3wrapper::parseMailbox( mailimf_mailbox *box )
         result.append( box->mb_addr_spec );
     } else {
-        result.append( box->mb_display_name );
+        result.append( convert_String(box->mb_display_name).latin1() );
         result.append( " <" );
         result.append( box->mb_addr_spec );