author | alwin <alwin> | 2003-12-10 01:19:51 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-10 01:19:51 (UTC) |
commit | c244afea4a03d7ae948152b5abac2f059fb1e789 (patch) (side-by-side diff) | |
tree | 74e9a6117c3c3854dd8f34cd5599dfb7fb185c86 | |
parent | 9a7db10da12232625be270feae5df761cfe11afa (diff) | |
download | opie-c244afea4a03d7ae948152b5abac2f059fb1e789.zip opie-c244afea4a03d7ae948152b5abac2f059fb1e789.tar.gz opie-c244afea4a03d7ae948152b5abac2f059fb1e789.tar.bz2 |
forgot the reply-to entry
-rw-r--r-- | noncore/net/mail/ProgrammersDoc/ReceivingMails.dia | bin | 3086 -> 3158 bytes | |||
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/imapwrapper.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/mailtypes.h | 5 |
7 files changed, 42 insertions, 30 deletions
diff --git a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia Binary files differindex 08c6434..2e3033e 100644 --- a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia +++ b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 5ce140e..eae85a7 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp @@ -210,9 +210,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) RecMail * m = 0; mailimap_msg_att_item *item=0; - bool named_from = false; - QString from,date,subject; - date = from = subject = ""; - clistcell *current,*c,*cf, *current_from = NULL; - mailimap_address * current_address = NULL; + clistcell *current,*c,*cf; mailimap_msg_att_dynamic*flist; mailimap_flag_fetch*cflag; @@ -272,11 +268,11 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { mailimap_envelope * head = item->msg_att_static->env; - date = head->date; - subject = head->subject; m = new RecMail(); + m->setDate(head->date); + m->setSubject(head->subject); if (head->from!=NULL) { addresslist = address_list_to_stringlist(head->from->list); if (addresslist.count()) { - from = addresslist.first(); + m->setFrom(addresslist.first()); } } @@ -293,11 +289,14 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) m->setBcc(addresslist); } - m->setSubject(subject); - m->setFrom(from); - m->setDate(date); + if (head->reply_to!=NULL) { + addresslist = address_list_to_stringlist(head->bcc->list); + if (addresslist.count()) { + m->setReplyto(addresslist.first()); + } + } m->setMsgid(QString(head->message_id)); qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", - from.latin1(), - subject.latin1(),date.latin1(),m->Msgid().latin1()); + m->getFrom().latin1(), + m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1()); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { mailimap_date_time*d = item->msg_att_static->internal_date; @@ -440,4 +439,5 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) } current = clist_begin(list); + unsigned int count = 0; while (current!= NULL) { from = ""; @@ -464,4 +464,7 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) } l.append(QString(from)); + if (++count > 99) { + break; + } } return l; diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h index 6565896..faab43c 100644 --- a/noncore/net/mail/imapwrapper.h +++ b/noncore/net/mail/imapwrapper.h @@ -29,5 +29,5 @@ protected: void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); - QStringList address_list_to_stringlist(clist*list); + static QStringList address_list_to_stringlist(clist*list); private: diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 5ce140e..eae85a7 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -210,9 +210,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) RecMail * m = 0; mailimap_msg_att_item *item=0; - bool named_from = false; - QString from,date,subject; - date = from = subject = ""; - clistcell *current,*c,*cf, *current_from = NULL; - mailimap_address * current_address = NULL; + clistcell *current,*c,*cf; mailimap_msg_att_dynamic*flist; mailimap_flag_fetch*cflag; @@ -272,11 +268,11 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { mailimap_envelope * head = item->msg_att_static->env; - date = head->date; - subject = head->subject; m = new RecMail(); + m->setDate(head->date); + m->setSubject(head->subject); if (head->from!=NULL) { addresslist = address_list_to_stringlist(head->from->list); if (addresslist.count()) { - from = addresslist.first(); + m->setFrom(addresslist.first()); } } @@ -293,11 +289,14 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) m->setBcc(addresslist); } - m->setSubject(subject); - m->setFrom(from); - m->setDate(date); + if (head->reply_to!=NULL) { + addresslist = address_list_to_stringlist(head->bcc->list); + if (addresslist.count()) { + m->setReplyto(addresslist.first()); + } + } m->setMsgid(QString(head->message_id)); qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", - from.latin1(), - subject.latin1(),date.latin1(),m->Msgid().latin1()); + m->getFrom().latin1(), + m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1()); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { mailimap_date_time*d = item->msg_att_static->internal_date; @@ -440,4 +439,5 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) } current = clist_begin(list); + unsigned int count = 0; while (current!= NULL) { from = ""; @@ -464,4 +464,7 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) } l.append(QString(from)); + if (++count > 99) { + break; + } } return l; diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 6565896..faab43c 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h @@ -29,5 +29,5 @@ protected: void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); - QStringList address_list_to_stringlist(clist*list); + static QStringList address_list_to_stringlist(clist*list); private: diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index c8d533a..6d6b080 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h @@ -45,4 +45,7 @@ public: void setMsgid(const QString&id){msg_id=id;} const QString&Msgid()const{return msg_id;} + void setReplyto(const QString&reply){replyto=reply;} + const QString&Replyto()const{return replyto;} + void setTo(const QStringList&list); @@ -56,5 +59,5 @@ public: protected: - QString subject,date,from,mbox,msg_id; + QString subject,date,from,mbox,msg_id,replyto; int msg_number; QBitArray msg_flags; diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h index c8d533a..6d6b080 100644 --- a/noncore/net/mail/mailtypes.h +++ b/noncore/net/mail/mailtypes.h @@ -45,4 +45,7 @@ public: void setMsgid(const QString&id){msg_id=id;} const QString&Msgid()const{return msg_id;} + void setReplyto(const QString&reply){replyto=reply;} + const QString&Replyto()const{return replyto;} + void setTo(const QStringList&list); @@ -56,5 +59,5 @@ public: protected: - QString subject,date,from,mbox,msg_id; + QString subject,date,from,mbox,msg_id,replyto; int msg_number; QBitArray msg_flags; |