Diffstat (limited to 'kmicromail/libmailwrapper/imapwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index be825ef..ca1c7f1 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp | |||
@@ -400,20 +400,25 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
400 | } | 400 | } |
401 | m = new RecMail(); | 401 | m = new RecMail(); |
402 | for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) { | 402 | for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) { |
403 | current = c; | 403 | current = c; |
404 | size = 0; | 404 | size = 0; |
405 | item = (mailimap_msg_att_item*)current->data; | 405 | item = (mailimap_msg_att_item*)current->data; |
406 | if ( !item ) | ||
407 | continue; | ||
406 | if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) { | 408 | if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) { |
407 | flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn; | 409 | flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn; |
408 | if (!flist->att_list) { | 410 | if (!flist || !flist->att_list) { |
409 | continue; | 411 | continue; |
410 | } | 412 | } |
411 | cf = flist->att_list->first; | 413 | cf = flist->att_list->first; |
414 | if( ! cf ) | ||
412 | for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) { | 415 | for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) { |
413 | cflag = (mailimap_flag_fetch*)cf->data; | 416 | cflag = (mailimap_flag_fetch*)cf->data; |
417 | if( ! cflag ) | ||
418 | qDebug("imap:not cflag "); | ||
414 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { | 419 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { |
415 | switch (cflag->fl_flag->fl_type) { | 420 | switch (cflag->fl_flag->fl_type) { |
416 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ | 421 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ |
417 | mFlags.setBit(FLAG_ANSWERED); | 422 | mFlags.setBit(FLAG_ANSWERED); |
418 | break; | 423 | break; |
419 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ | 424 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ |
@@ -438,16 +443,22 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
438 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { | 443 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { |
439 | mFlags.setBit(FLAG_RECENT); | 444 | mFlags.setBit(FLAG_RECENT); |
440 | } | 445 | } |
441 | } | 446 | } |
442 | continue; | 447 | continue; |
443 | } | 448 | } |
449 | if ( item->att_data.att_static == NULL ) | ||
450 | continue; | ||
444 | if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) { | 451 | if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) { |
445 | mailimap_envelope * head = item->att_data.att_static->att_data.att_env; | 452 | mailimap_envelope * head = item->att_data.att_static->att_data.att_env; |
446 | m->setDate(head->env_date); | 453 | if ( head == NULL ) |
447 | m->setSubject(convert_String((const char*)head->env_subject)); | 454 | continue; |
455 | if ( head->env_date != NULL ) | ||
456 | m->setDate(head->env_date); | ||
457 | if ( head->env_subject != NULL ) | ||
458 | m->setSubject(convert_String((const char*)head->env_subject)); | ||
448 | //m->setSubject(head->env_subject); | 459 | //m->setSubject(head->env_subject); |
449 | if (head->env_from!=NULL) { | 460 | if (head->env_from!=NULL) { |
450 | addresslist = address_list_to_stringlist(head->env_from->frm_list); | 461 | addresslist = address_list_to_stringlist(head->env_from->frm_list); |
451 | if (addresslist.count()) { | 462 | if (addresslist.count()) { |
452 | m->setFrom(addresslist.first()); | 463 | m->setFrom(addresslist.first()); |
453 | } | 464 | } |
@@ -480,13 +491,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
480 | h.remove(h.length()-1,1); | 491 | h.remove(h.length()-1,1); |
481 | } | 492 | } |
482 | if (h.length()>0) { | 493 | if (h.length()>0) { |
483 | m->setInreply(QStringList(h)); | 494 | m->setInreply(QStringList(h)); |
484 | } | 495 | } |
485 | } | 496 | } |
486 | if (head->env_message_id) { | 497 | if (head->env_message_id != NULL) { |
487 | m->setMsgid(QString(head->env_message_id)); | 498 | m->setMsgid(QString(head->env_message_id)); |
488 | } | 499 | } |
489 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { | 500 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { |
490 | #if 0 | 501 | #if 0 |
491 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; | 502 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; |
492 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); | 503 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); |