summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/imapwrapper.cpp11
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp11
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
@@ -18,13 +18,13 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
18{ 18{
19 const char *server, *user, *pass, *mb; 19 const char *server, *user, *pass, *mb;
20 uint16_t port; 20 uint16_t port;
21 int err = MAILIMAP_NO_ERROR; 21 int err = MAILIMAP_NO_ERROR;
22 clist *result; 22 clist *result;
23 clistcell *current; 23 clistcell *current;
24 mailimap_fetch_att *fetchAtt,*fetchAttFlags; 24 mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
25 mailimap_fetch_type *fetchType; 25 mailimap_fetch_type *fetchType;
26 mailimap_set *set; 26 mailimap_set *set;
27 27
28 mb = mailbox.latin1(); 28 mb = mailbox.latin1();
29 server = account->getServer().latin1(); 29 server = account->getServer().latin1();
30 port = account->getPort().toUInt(); 30 port = account->getPort().toUInt();
@@ -78,20 +78,23 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
78 78
79 result = clist_new(); 79 result = clist_new();
80 /* the range has to start at 1!!! not with 0!!!! */ 80 /* the range has to start at 1!!! not with 0!!!! */
81 set = mailimap_set_new_interval( 1, last ); 81 set = mailimap_set_new_interval( 1, last );
82 fetchAtt = mailimap_fetch_att_new_envelope(); 82 fetchAtt = mailimap_fetch_att_new_envelope();
83 fetchAttFlags = mailimap_fetch_att_new_flags(); 83 fetchAttFlags = mailimap_fetch_att_new_flags();
84 fetchAttDate = mailimap_fetch_att_new_internaldate();
84 85
85 //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); 86 //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
86 fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); 87 fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
87 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt); 88 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt);
88 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); 89 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags);
90 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate);
89 91
90 err = mailimap_fetch( imap, set, fetchType, &result ); 92 err = mailimap_fetch( imap, set, fetchType, &result );
91 mailimap_set_free( set ); 93 mailimap_set_free( set );
94 /* cleans up the fetch_att's too! */
92 mailimap_fetch_type_free( fetchType ); 95 mailimap_fetch_type_free( fetchType );
93 96
94 QString date,subject,from; 97 QString date,subject,from;
95 98
96 if ( err == MAILIMAP_NO_ERROR ) { 99 if ( err == MAILIMAP_NO_ERROR ) {
97 current = clist_begin(result); 100 current = clist_begin(result);
@@ -311,12 +314,17 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
311 from.latin1(), 314 from.latin1(),
312 subject.latin1(),date.latin1()); 315 subject.latin1(),date.latin1());
313 m = new RecMail(); 316 m = new RecMail();
314 m->setSubject(subject); 317 m->setSubject(subject);
315 m->setFrom(from); 318 m->setFrom(from);
316 m->setDate(date); 319 m->setDate(date);
320 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
321 mailimap_date_time*d = item->msg_att_static->internal_date;
322 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
323 qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec);
324 qDebug(da.toString());
317 } else { 325 } else {
318 qDebug("Another type"); 326 qDebug("Another type");
319 } 327 }
320 } 328 }
321 /* msg is already deleted */ 329 /* msg is already deleted */
322 if (mFlags.testBit(FLAG_DELETED) && m) { 330 if (mFlags.testBit(FLAG_DELETED) && m) {
@@ -406,6 +414,7 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail)
406 err = mailimap_close( imap ); 414 err = mailimap_close( imap );
407 mailimap_free( imap ); 415 mailimap_free( imap );
408 clist_free(result); 416 clist_free(result);
409 417
410 return body; 418 return body;
411} 419}
420
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
@@ -18,13 +18,13 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
18{ 18{
19 const char *server, *user, *pass, *mb; 19 const char *server, *user, *pass, *mb;
20 uint16_t port; 20 uint16_t port;
21 int err = MAILIMAP_NO_ERROR; 21 int err = MAILIMAP_NO_ERROR;
22 clist *result; 22 clist *result;
23 clistcell *current; 23 clistcell *current;
24 mailimap_fetch_att *fetchAtt,*fetchAttFlags; 24 mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
25 mailimap_fetch_type *fetchType; 25 mailimap_fetch_type *fetchType;
26 mailimap_set *set; 26 mailimap_set *set;
27 27
28 mb = mailbox.latin1(); 28 mb = mailbox.latin1();
29 server = account->getServer().latin1(); 29 server = account->getServer().latin1();
30 port = account->getPort().toUInt(); 30 port = account->getPort().toUInt();
@@ -78,20 +78,23 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
78 78
79 result = clist_new(); 79 result = clist_new();
80 /* the range has to start at 1!!! not with 0!!!! */ 80 /* the range has to start at 1!!! not with 0!!!! */
81 set = mailimap_set_new_interval( 1, last ); 81 set = mailimap_set_new_interval( 1, last );
82 fetchAtt = mailimap_fetch_att_new_envelope(); 82 fetchAtt = mailimap_fetch_att_new_envelope();
83 fetchAttFlags = mailimap_fetch_att_new_flags(); 83 fetchAttFlags = mailimap_fetch_att_new_flags();
84 fetchAttDate = mailimap_fetch_att_new_internaldate();
84 85
85 //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); 86 //fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
86 fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); 87 fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
87 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt); 88 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAtt);
88 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); 89 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags);
90 mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate);
89 91
90 err = mailimap_fetch( imap, set, fetchType, &result ); 92 err = mailimap_fetch( imap, set, fetchType, &result );
91 mailimap_set_free( set ); 93 mailimap_set_free( set );
94 /* cleans up the fetch_att's too! */
92 mailimap_fetch_type_free( fetchType ); 95 mailimap_fetch_type_free( fetchType );
93 96
94 QString date,subject,from; 97 QString date,subject,from;
95 98
96 if ( err == MAILIMAP_NO_ERROR ) { 99 if ( err == MAILIMAP_NO_ERROR ) {
97 current = clist_begin(result); 100 current = clist_begin(result);
@@ -311,12 +314,17 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
311 from.latin1(), 314 from.latin1(),
312 subject.latin1(),date.latin1()); 315 subject.latin1(),date.latin1());
313 m = new RecMail(); 316 m = new RecMail();
314 m->setSubject(subject); 317 m->setSubject(subject);
315 m->setFrom(from); 318 m->setFrom(from);
316 m->setDate(date); 319 m->setDate(date);
320 } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) {
321 mailimap_date_time*d = item->msg_att_static->internal_date;
322 QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec));
323 qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec);
324 qDebug(da.toString());
317 } else { 325 } else {
318 qDebug("Another type"); 326 qDebug("Another type");
319 } 327 }
320 } 328 }
321 /* msg is already deleted */ 329 /* msg is already deleted */
322 if (mFlags.testBit(FLAG_DELETED) && m) { 330 if (mFlags.testBit(FLAG_DELETED) && m) {
@@ -406,6 +414,7 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail)
406 err = mailimap_close( imap ); 414 err = mailimap_close( imap );
407 mailimap_free( imap ); 415 mailimap_free( imap );
408 clist_free(result); 416 clist_free(result);
409 417
410 return body; 418 return body;
411} 419}
420