summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/ProgrammersDoc/ReceivingMails.diabin3086 -> 3158 bytes
-rw-r--r--noncore/net/mail/imapwrapper.cpp29
-rw-r--r--noncore/net/mail/imapwrapper.h2
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp29
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.h2
-rw-r--r--noncore/net/mail/libmailwrapper/mailtypes.h5
-rw-r--r--noncore/net/mail/mailtypes.h5
7 files changed, 42 insertions, 30 deletions
diff --git a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
index 08c6434..2e3033e 100644
--- a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
+++ b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia
Binary files differ
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
@@ -209,11 +209,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
209{ 209{
210 RecMail * m = 0; 210 RecMail * m = 0;
211 mailimap_msg_att_item *item=0; 211 mailimap_msg_att_item *item=0;
212 bool named_from = false; 212 clistcell *current,*c,*cf;
213 QString from,date,subject;
214 date = from = subject = "";
215 clistcell *current,*c,*cf, *current_from = NULL;
216 mailimap_address * current_address = NULL;
217 mailimap_msg_att_dynamic*flist; 213 mailimap_msg_att_dynamic*flist;
218 mailimap_flag_fetch*cflag; 214 mailimap_flag_fetch*cflag;
219 QBitArray mFlags(7); 215 QBitArray mFlags(7);
@@ -271,13 +267,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
271 qDebug( "header: \n%s", item->msg_att_static->rfc822_header ); 267 qDebug( "header: \n%s", item->msg_att_static->rfc822_header );
272 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { 268 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) {
273 mailimap_envelope * head = item->msg_att_static->env; 269 mailimap_envelope * head = item->msg_att_static->env;
274 date = head->date;
275 subject = head->subject;
276 m = new RecMail(); 270 m = new RecMail();
271 m->setDate(head->date);
272 m->setSubject(head->subject);
277 if (head->from!=NULL) { 273 if (head->from!=NULL) {
278 addresslist = address_list_to_stringlist(head->from->list); 274 addresslist = address_list_to_stringlist(head->from->list);
279 if (addresslist.count()) { 275 if (addresslist.count()) {
280 from = addresslist.first(); 276 m->setFrom(addresslist.first());
281 } 277 }
282 } 278 }
283 if (head->to!=NULL) { 279 if (head->to!=NULL) {
@@ -292,13 +288,16 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
292 addresslist = address_list_to_stringlist(head->bcc->list); 288 addresslist = address_list_to_stringlist(head->bcc->list);
293 m->setBcc(addresslist); 289 m->setBcc(addresslist);
294 } 290 }
295 m->setSubject(subject); 291 if (head->reply_to!=NULL) {
296 m->setFrom(from); 292 addresslist = address_list_to_stringlist(head->bcc->list);
297 m->setDate(date); 293 if (addresslist.count()) {
294 m->setReplyto(addresslist.first());
295 }
296 }
298 m->setMsgid(QString(head->message_id)); 297 m->setMsgid(QString(head->message_id));
299 qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", 298 qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s",
300 from.latin1(), 299 m->getFrom().latin1(),
301 subject.latin1(),date.latin1(),m->Msgid().latin1()); 300 m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1());
302 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { 301 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
303 mailimap_date_time*d = item->msg_att_static->internal_date; 302 mailimap_date_time*d = item->msg_att_static->internal_date;
304 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); 303 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
@@ -439,6 +438,7 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
439 return l; 438 return l;
440 } 439 }
441 current = clist_begin(list); 440 current = clist_begin(list);
441 unsigned int count = 0;
442 while (current!= NULL) { 442 while (current!= NULL) {
443 from = ""; 443 from = "";
444 named_from = false; 444 named_from = false;
@@ -463,6 +463,9 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
463 from+=">"; 463 from+=">";
464 } 464 }
465 l.append(QString(from)); 465 l.append(QString(from));
466 if (++count > 99) {
467 break;
468 }
466 } 469 }
467 return l; 470 return l;
468} 471}
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
@@ -28,7 +28,7 @@ protected:
28 void logout(); 28 void logout();
29 void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); 29 void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
30 void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); 30 void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body);
31 QStringList address_list_to_stringlist(clist*list); 31 static QStringList address_list_to_stringlist(clist*list);
32 32
33private: 33private:
34 IMAPaccount *account; 34 IMAPaccount *account;
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
@@ -209,11 +209,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
209{ 209{
210 RecMail * m = 0; 210 RecMail * m = 0;
211 mailimap_msg_att_item *item=0; 211 mailimap_msg_att_item *item=0;
212 bool named_from = false; 212 clistcell *current,*c,*cf;
213 QString from,date,subject;
214 date = from = subject = "";
215 clistcell *current,*c,*cf, *current_from = NULL;
216 mailimap_address * current_address = NULL;
217 mailimap_msg_att_dynamic*flist; 213 mailimap_msg_att_dynamic*flist;
218 mailimap_flag_fetch*cflag; 214 mailimap_flag_fetch*cflag;
219 QBitArray mFlags(7); 215 QBitArray mFlags(7);
@@ -271,13 +267,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
271 qDebug( "header: \n%s", item->msg_att_static->rfc822_header ); 267 qDebug( "header: \n%s", item->msg_att_static->rfc822_header );
272 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { 268 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) {
273 mailimap_envelope * head = item->msg_att_static->env; 269 mailimap_envelope * head = item->msg_att_static->env;
274 date = head->date;
275 subject = head->subject;
276 m = new RecMail(); 270 m = new RecMail();
271 m->setDate(head->date);
272 m->setSubject(head->subject);
277 if (head->from!=NULL) { 273 if (head->from!=NULL) {
278 addresslist = address_list_to_stringlist(head->from->list); 274 addresslist = address_list_to_stringlist(head->from->list);
279 if (addresslist.count()) { 275 if (addresslist.count()) {
280 from = addresslist.first(); 276 m->setFrom(addresslist.first());
281 } 277 }
282 } 278 }
283 if (head->to!=NULL) { 279 if (head->to!=NULL) {
@@ -292,13 +288,16 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
292 addresslist = address_list_to_stringlist(head->bcc->list); 288 addresslist = address_list_to_stringlist(head->bcc->list);
293 m->setBcc(addresslist); 289 m->setBcc(addresslist);
294 } 290 }
295 m->setSubject(subject); 291 if (head->reply_to!=NULL) {
296 m->setFrom(from); 292 addresslist = address_list_to_stringlist(head->bcc->list);
297 m->setDate(date); 293 if (addresslist.count()) {
294 m->setReplyto(addresslist.first());
295 }
296 }
298 m->setMsgid(QString(head->message_id)); 297 m->setMsgid(QString(head->message_id));
299 qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", 298 qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s",
300 from.latin1(), 299 m->getFrom().latin1(),
301 subject.latin1(),date.latin1(),m->Msgid().latin1()); 300 m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1());
302 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { 301 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
303 mailimap_date_time*d = item->msg_att_static->internal_date; 302 mailimap_date_time*d = item->msg_att_static->internal_date;
304 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); 303 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
@@ -439,6 +438,7 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
439 return l; 438 return l;
440 } 439 }
441 current = clist_begin(list); 440 current = clist_begin(list);
441 unsigned int count = 0;
442 while (current!= NULL) { 442 while (current!= NULL) {
443 from = ""; 443 from = "";
444 named_from = false; 444 named_from = false;
@@ -463,6 +463,9 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
463 from+=">"; 463 from+=">";
464 } 464 }
465 l.append(QString(from)); 465 l.append(QString(from));
466 if (++count > 99) {
467 break;
468 }
466 } 469 }
467 return l; 470 return l;
468} 471}
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
@@ -28,7 +28,7 @@ protected:
28 void logout(); 28 void logout();
29 void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); 29 void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body);
30 void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); 30 void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body);
31 QStringList address_list_to_stringlist(clist*list); 31 static QStringList address_list_to_stringlist(clist*list);
32 32
33private: 33private:
34 IMAPaccount *account; 34 IMAPaccount *account;
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
@@ -44,6 +44,9 @@ public:
44 void setMbox(const QString&box){mbox = box;} 44 void setMbox(const QString&box){mbox = box;}
45 void setMsgid(const QString&id){msg_id=id;} 45 void setMsgid(const QString&id){msg_id=id;}
46 const QString&Msgid()const{return msg_id;} 46 const QString&Msgid()const{return msg_id;}
47 void setReplyto(const QString&reply){replyto=reply;}
48 const QString&Replyto()const{return replyto;}
49
47 50
48 void setTo(const QStringList&list); 51 void setTo(const QStringList&list);
49 const QStringList&To()const; 52 const QStringList&To()const;
@@ -55,7 +58,7 @@ public:
55 void setFlags(const QBitArray&flags){msg_flags = flags;} 58 void setFlags(const QBitArray&flags){msg_flags = flags;}
56 59
57protected: 60protected:
58 QString subject,date,from,mbox,msg_id; 61 QString subject,date,from,mbox,msg_id,replyto;
59 int msg_number; 62 int msg_number;
60 QBitArray msg_flags; 63 QBitArray msg_flags;
61 QStringList to,cc,bcc; 64 QStringList to,cc,bcc;
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
@@ -44,6 +44,9 @@ public:
44 void setMbox(const QString&box){mbox = box;} 44 void setMbox(const QString&box){mbox = box;}
45 void setMsgid(const QString&id){msg_id=id;} 45 void setMsgid(const QString&id){msg_id=id;}
46 const QString&Msgid()const{return msg_id;} 46 const QString&Msgid()const{return msg_id;}
47 void setReplyto(const QString&reply){replyto=reply;}
48 const QString&Replyto()const{return replyto;}
49
47 50
48 void setTo(const QStringList&list); 51 void setTo(const QStringList&list);
49 const QStringList&To()const; 52 const QStringList&To()const;
@@ -55,7 +58,7 @@ public:
55 void setFlags(const QBitArray&flags){msg_flags = flags;} 58 void setFlags(const QBitArray&flags){msg_flags = flags;}
56 59
57protected: 60protected:
58 QString subject,date,from,mbox,msg_id; 61 QString subject,date,from,mbox,msg_id,replyto;
59 int msg_number; 62 int msg_number;
60 QBitArray msg_flags; 63 QBitArray msg_flags;
61 QStringList to,cc,bcc; 64 QStringList to,cc,bcc;