| -rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 11 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 16f4565..fc12947 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp @@ -8,33 +8,33 @@ IMAPwrapper::IMAPwrapper( IMAPaccount *a ) { account = a; } void imap_progress( size_t current, size_t maximum ) { qDebug( "IMAP: %i of %i", current, maximum ); } void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) { const char *server, *user, *pass, *mb; uint16_t port; int err = MAILIMAP_NO_ERROR; clist *result; clistcell *current; - mailimap_fetch_att *fetchAtt,*fetchAttFlags; + mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate; mailimap_fetch_type *fetchType; mailimap_set *set; mb = mailbox.latin1(); server = account->getServer().latin1(); port = account->getPort().toUInt(); user = account->getUser().latin1(); pass = account->getPassword().latin1(); mailimap *imap = mailimap_new( 20, &imap_progress ); if ( imap == NULL ) { qDebug("IMAP Memory error"); return; } /* connect */ @@ -68,40 +68,43 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) int last = imap->selection_info->exists; if (last == 0) { qDebug("mailbox has no mails"); err = mailimap_logout( imap ); err = mailimap_close( imap ); mailimap_free( imap ); return; } result = clist_new(); /* the range has to start at 1!!! not with 0!!!! */ set = mailimap_set_new_interval( 1, last ); fetchAtt = mailimap_fetch_att_new_envelope(); fetchAttFlags = mailimap_fetch_att_new_flags(); + fetchAttDate = mailimap_fetch_att_new_internaldate(); //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt); mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); + mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate); err = mailimap_fetch( imap, set, fetchType, &result ); mailimap_set_free( set ); + /* cleans up the fetch_att's too! */ mailimap_fetch_type_free( fetchType ); QString date,subject,from; if ( err == MAILIMAP_NO_ERROR ) { current = clist_begin(result); mailimap_msg_att * msg_att; int i = 0; while ( current != 0 ) { ++i; msg_att = (mailimap_msg_att*)current->data; RecMail*m = parse_list_result(msg_att); if (m) { m->setNumber(i); target.append(m); } @@ -301,32 +304,37 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) from+="@"; } if (current_address->host_name) { from+=QString(current_address->host_name); } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+=">"; } } qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s", from.latin1(), subject.latin1(),date.latin1()); m = new RecMail(); m->setSubject(subject); m->setFrom(from); m->setDate(date); + } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { + mailimap_date_time*d = item->msg_att_static->internal_date; + QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); + qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec); + qDebug(da.toString()); } else { qDebug("Another type"); } } /* msg is already deleted */ if (mFlags.testBit(FLAG_DELETED) && m) { delete m; m = 0; } if (m) { m->setFlags(mFlags); } return m; } QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) @@ -396,16 +404,17 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; if (item->msg_att_static && item->msg_att_static->rfc822_text) { body = item->msg_att_static->rfc822_text; } } else { qDebug("error fetching text: %s",imap->response); } err = mailimap_logout( imap ); err = mailimap_close( imap ); mailimap_free( imap ); clist_free(result); return body; } + diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 16f4565..fc12947 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -8,33 +8,33 @@ IMAPwrapper::IMAPwrapper( IMAPaccount *a ) { account = a; } void imap_progress( size_t current, size_t maximum ) { qDebug( "IMAP: %i of %i", current, maximum ); } void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) { const char *server, *user, *pass, *mb; uint16_t port; int err = MAILIMAP_NO_ERROR; clist *result; clistcell *current; - mailimap_fetch_att *fetchAtt,*fetchAttFlags; + mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate; mailimap_fetch_type *fetchType; mailimap_set *set; mb = mailbox.latin1(); server = account->getServer().latin1(); port = account->getPort().toUInt(); user = account->getUser().latin1(); pass = account->getPassword().latin1(); mailimap *imap = mailimap_new( 20, &imap_progress ); if ( imap == NULL ) { qDebug("IMAP Memory error"); return; } /* connect */ @@ -68,40 +68,43 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) int last = imap->selection_info->exists; if (last == 0) { qDebug("mailbox has no mails"); err = mailimap_logout( imap ); err = mailimap_close( imap ); mailimap_free( imap ); return; } result = clist_new(); /* the range has to start at 1!!! not with 0!!!! */ set = mailimap_set_new_interval( 1, last ); fetchAtt = mailimap_fetch_att_new_envelope(); fetchAttFlags = mailimap_fetch_att_new_flags(); + fetchAttDate = mailimap_fetch_att_new_internaldate(); //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt); mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); + mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate); err = mailimap_fetch( imap, set, fetchType, &result ); mailimap_set_free( set ); + /* cleans up the fetch_att's too! */ mailimap_fetch_type_free( fetchType ); QString date,subject,from; if ( err == MAILIMAP_NO_ERROR ) { current = clist_begin(result); mailimap_msg_att * msg_att; int i = 0; while ( current != 0 ) { ++i; msg_att = (mailimap_msg_att*)current->data; RecMail*m = parse_list_result(msg_att); if (m) { m->setNumber(i); target.append(m); } @@ -301,32 +304,37 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) from+="@"; } if (current_address->host_name) { from+=QString(current_address->host_name); } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+=">"; } } qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s", from.latin1(), subject.latin1(),date.latin1()); m = new RecMail(); m->setSubject(subject); m->setFrom(from); m->setDate(date); + } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { + mailimap_date_time*d = item->msg_att_static->internal_date; + QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); + qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec); + qDebug(da.toString()); } else { qDebug("Another type"); } } /* msg is already deleted */ if (mFlags.testBit(FLAG_DELETED) && m) { delete m; m = 0; } if (m) { m->setFlags(mFlags); } return m; } QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) @@ -396,16 +404,17 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; if (item->msg_att_static && item->msg_att_static->rfc822_text) { body = item->msg_att_static->rfc822_text; } } else { qDebug("error fetching text: %s",imap->response); } err = mailimap_logout( imap ); err = mailimap_close( imap ); mailimap_free( imap ); clist_free(result); return body; } + |