Diffstat (limited to 'noncore/net/mail/libmailwrapper/imapwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 3375e69..e29a0a0 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -114,20 +114,20 @@ void IMAPwrapper::login() | |||
114 | server = account->getServer().latin1(); | 114 | server = account->getServer().latin1(); |
115 | port = account->getPort().toUInt(); | 115 | port = account->getPort().toUInt(); |
116 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { | 116 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { |
117 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); | 117 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); |
118 | login.show(); | 118 | login.show(); |
119 | if ( QDialog::Accepted == login.exec() ) { | 119 | if ( QDialog::Accepted == login.exec() ) { |
120 | // ok | 120 | // ok |
121 | user = login.getUser().latin1(); | 121 | user = login.getUser().latin1(); |
122 | pass = login.getPassword().latin1(); | 122 | pass = login.getPassword().latin1(); |
123 | } else { | 123 | } else { |
124 | // cancel | 124 | // cancel |
125 | qDebug( "IMAP: Login canceled" ); | 125 | qDebug( "IMAP: Login canceled" ); |
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | } else { | 128 | } else { |
129 | user = account->getUser().latin1(); | 129 | user = account->getUser().latin1(); |
130 | pass = account->getPassword().latin1(); | 130 | pass = account->getPassword().latin1(); |
131 | } | 131 | } |
132 | 132 | ||
133 | m_imap = mailimap_new( 20, &imap_progress ); | 133 | m_imap = mailimap_new( 20, &imap_progress ); |
@@ -439,4 +439,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
439 | m->setBcc(addresslist); | 439 | m->setBcc(addresslist); |
440 | } | 440 | } |
441 | /* reply to address, eg. email. */ | ||
441 | if (head->env_reply_to!=NULL) { | 442 | if (head->env_reply_to!=NULL) { |
442 | addresslist = address_list_to_stringlist(head->env_reply_to->rt_list); | 443 | addresslist = address_list_to_stringlist(head->env_reply_to->rt_list); |
@@ -445,5 +446,19 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
445 | } | 446 | } |
446 | } | 447 | } |
447 | m->setMsgid(QString(head->env_message_id)); | 448 | if (head->env_in_reply_to!=NULL) { |
449 | QString h(head->env_in_reply_to); | ||
450 | while (h.length()>0 && h[0]=='<') { | ||
451 | h.remove(0,1); | ||
452 | } | ||
453 | while (h.length()>0 && h[h.length()-1]=='>') { | ||
454 | h.remove(h.length()-1,1); | ||
455 | } | ||
456 | if (h.length()>0) { | ||
457 | m->setInreply(QStringList(h)); | ||
458 | } | ||
459 | } | ||
460 | if (head->env_message_id) { | ||
461 | m->setMsgid(QString(head->env_message_id)); | ||
462 | } | ||
448 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { | 463 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { |
449 | #if 0 | 464 | #if 0 |