-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index d9496af..93fb7de 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp | |||
@@ -433,17 +433,18 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
433 | if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) { | 433 | if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) { |
434 | flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn; | 434 | flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn; |
435 | if (!flist || !flist->att_list) { | 435 | if (!flist || !flist->att_list) { |
436 | continue; | 436 | continue; |
437 | } | 437 | } |
438 | cf = flist->att_list->first; | 438 | cf = flist->att_list->first; |
439 | if( ! cf ) | 439 | if( cf ) { |
440 | for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) { | 440 | for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) { |
441 | cflag = (mailimap_flag_fetch*)cf->data; | 441 | cflag = (mailimap_flag_fetch*)cf->data; |
442 | if( ! cflag ) | 442 | if( ! cflag ) |
443 | qDebug("imap:not cflag "); | 443 | qDebug("imap:NO cflag "); |
444 | else { | ||
444 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { | 445 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { |
445 | switch (cflag->fl_flag->fl_type) { | 446 | switch (cflag->fl_flag->fl_type) { |
446 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ | 447 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ |
447 | mFlags.setBit(FLAG_ANSWERED); | 448 | mFlags.setBit(FLAG_ANSWERED); |
448 | break; | 449 | break; |
449 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ | 450 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ |
@@ -466,12 +467,15 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
466 | break; | 467 | break; |
467 | } | 468 | } |
468 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { | 469 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { |
469 | mFlags.setBit(FLAG_RECENT); | 470 | mFlags.setBit(FLAG_RECENT); |
470 | } | 471 | } |
471 | } | 472 | } |
473 | } | ||
474 | } | ||
475 | //qDebug(" continue"); | ||
472 | continue; | 476 | continue; |
473 | } | 477 | } |
474 | if ( item->att_data.att_static == NULL ) | 478 | if ( item->att_data.att_static == NULL ) |
475 | continue; | 479 | continue; |
476 | if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) { | 480 | if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) { |
477 | mailimap_envelope * head = item->att_data.att_static->att_data.att_env; | 481 | mailimap_envelope * head = item->att_data.att_static->att_data.att_env; |
@@ -482,12 +486,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
482 | //struct mailimf_date_time result; | 486 | //struct mailimf_date_time result; |
483 | struct mailimf_date_time* date;// = &result; | 487 | struct mailimf_date_time* date;// = &result; |
484 | struct mailimf_date_time **re = &date; | 488 | struct mailimf_date_time **re = &date; |
485 | size_t length = m->getDate().length(); | 489 | size_t length = m->getDate().length(); |
486 | size_t index = 0; | 490 | size_t index = 0; |
487 | if ( mailimf_date_time_parse(head->env_date, length,&index, re ) == MAILIMF_NO_ERROR ) { | 491 | if ( mailimf_date_time_parse(head->env_date, length,&index, re ) == MAILIMF_NO_ERROR ) { |
492 | //qDebug("parseDateTime "); | ||
488 | QDateTime dt = Genericwrapper::parseDateTime( date ); | 493 | QDateTime dt = Genericwrapper::parseDateTime( date ); |
489 | QString ret; | 494 | QString ret; |
490 | if ( dt.date() == QDate::currentDate () ) | 495 | if ( dt.date() == QDate::currentDate () ) |
491 | ret = KGlobal::locale()->formatTime( dt.time(),true); | 496 | ret = KGlobal::locale()->formatTime( dt.time(),true); |
492 | else { | 497 | else { |
493 | ret = KGlobal::locale()->formatDateTime( dt,true,true); | 498 | ret = KGlobal::locale()->formatDateTime( dt,true,true); |
@@ -604,13 +609,13 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) | |||
604 | msg_att = (mailimap_msg_att*)current->data; | 609 | msg_att = (mailimap_msg_att*)current->data; |
605 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 610 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
606 | QValueList<int> path; | 611 | QValueList<int> path; |
607 | body_desc = item->att_data.att_static->att_data.att_body; | 612 | body_desc = item->att_data.att_static->att_data.att_body; |
608 | traverseBody(mail,body_desc,body,0,path); | 613 | traverseBody(mail,body_desc,body,0,path); |
609 | } else { | 614 | } else { |
610 | //odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; | 615 | qDebug("error fetching body %d (%d): %s", err, MAILIMAP_NO_ERROR, m_imap->imap_response ); |
611 | } | 616 | } |
612 | if (result) mailimap_fetch_list_free(result); | 617 | if (result) mailimap_fetch_list_free(result); |
613 | return body; | 618 | return body; |
614 | } | 619 | } |
615 | 620 | ||
616 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 621 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |