author | zautrix <zautrix> | 2004-09-10 20:16:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-10 20:16:14 (UTC) |
commit | 768ce5ccec90c1b062b749e7ad0464d09760b91c (patch) (unidiff) | |
tree | 78523f09e276d6ac881ff20905ddacee1851af66 | |
parent | cebdd6de7481514ad5ea0517f7a2e8f4db422be5 (diff) | |
download | kdepimpi-768ce5ccec90c1b062b749e7ad0464d09760b91c.zip kdepimpi-768ce5ccec90c1b062b749e7ad0464d09760b91c.tar.gz kdepimpi-768ce5ccec90c1b062b749e7ad0464d09760b91c.tar.bz2 |
Some imap fixes
-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 | |||
@@ -310,273 +310,284 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | |||
310 | /* | 310 | /* |
311 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 311 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
312 | * We must not forget to filter them out in next loop! | 312 | * We must not forget to filter them out in next loop! |
313 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 313 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
314 | */ | 314 | */ |
315 | QString temp; | 315 | QString temp; |
316 | mask = "INBOX" ; | 316 | mask = "INBOX" ; |
317 | mailimap_mailbox_list *list; | 317 | mailimap_mailbox_list *list; |
318 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); | 318 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); |
319 | QString del; | 319 | QString del; |
320 | bool selectable = true; | 320 | bool selectable = true; |
321 | bool no_inferiors = false; | 321 | bool no_inferiors = false; |
322 | if ( err == MAILIMAP_NO_ERROR ) { | 322 | if ( err == MAILIMAP_NO_ERROR ) { |
323 | current = result->first; | 323 | current = result->first; |
324 | for ( int i = result->count; i > 0; i-- ) { | 324 | for ( int i = result->count; i > 0; i-- ) { |
325 | list = (mailimap_mailbox_list *) current->data; | 325 | list = (mailimap_mailbox_list *) current->data; |
326 | // it is better use the deep copy mechanism of qt itself | 326 | // it is better use the deep copy mechanism of qt itself |
327 | // instead of using strdup! | 327 | // instead of using strdup! |
328 | temp = list->mb_name; | 328 | temp = list->mb_name; |
329 | del = list->mb_delimiter; | 329 | del = list->mb_delimiter; |
330 | current = current->next; | 330 | current = current->next; |
331 | if ( (bflags = list->mb_flag) ) { | 331 | if ( (bflags = list->mb_flag) ) { |
332 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | 332 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& |
333 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | 333 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); |
334 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { | 334 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { |
335 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { | 335 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { |
336 | no_inferiors = true; | 336 | no_inferiors = true; |
337 | } | 337 | } |
338 | } | 338 | } |
339 | } | 339 | } |
340 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 340 | folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
341 | } | 341 | } |
342 | } else { | 342 | } else { |
343 | qDebug("error fetching folders: "); | 343 | qDebug("error fetching folders: "); |
344 | 344 | ||
345 | } | 345 | } |
346 | mailimap_list_result_free( result ); | 346 | mailimap_list_result_free( result ); |
347 | 347 | ||
348 | /* | 348 | /* |
349 | * second stage - get the other then inbox folders | 349 | * second stage - get the other then inbox folders |
350 | */ | 350 | */ |
351 | mask = "*" ; | 351 | mask = "*" ; |
352 | path = account->getPrefix().latin1(); | 352 | path = account->getPrefix().latin1(); |
353 | if (!path) path = ""; | 353 | if (!path) path = ""; |
354 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 354 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
355 | if ( err == MAILIMAP_NO_ERROR ) { | 355 | if ( err == MAILIMAP_NO_ERROR ) { |
356 | current = result->first; | 356 | current = result->first; |
357 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { | 357 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
358 | no_inferiors = false; | 358 | no_inferiors = false; |
359 | list = (mailimap_mailbox_list *) current->data; | 359 | list = (mailimap_mailbox_list *) current->data; |
360 | // it is better use the deep copy mechanism of qt itself | 360 | // it is better use the deep copy mechanism of qt itself |
361 | // instead of using strdup! | 361 | // instead of using strdup! |
362 | temp = list->mb_name; | 362 | temp = list->mb_name; |
363 | if (temp.lower()=="inbox") | 363 | if (temp.lower()=="inbox") |
364 | continue; | 364 | continue; |
365 | if (temp.lower()==account->getPrefix().lower()) | 365 | if (temp.lower()==account->getPrefix().lower()) |
366 | continue; | 366 | continue; |
367 | if ( (bflags = list->mb_flag) ) { | 367 | if ( (bflags = list->mb_flag) ) { |
368 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | 368 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& |
369 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | 369 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); |
370 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { | 370 | for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { |
371 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { | 371 | if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { |
372 | no_inferiors = true; | 372 | no_inferiors = true; |
373 | } | 373 | } |
374 | } | 374 | } |
375 | } | 375 | } |
376 | del = list->mb_delimiter; | 376 | del = list->mb_delimiter; |
377 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); | 377 | folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); |
378 | } | 378 | } |
379 | } else { | 379 | } else { |
380 | qDebug("error fetching folders "); | 380 | qDebug("error fetching folders "); |
381 | 381 | ||
382 | } | 382 | } |
383 | if (result) mailimap_list_result_free( result ); | 383 | if (result) mailimap_list_result_free( result ); |
384 | return folders; | 384 | return folders; |
385 | } | 385 | } |
386 | 386 | ||
387 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 387 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
388 | { | 388 | { |
389 | RecMail * m = 0; | 389 | RecMail * m = 0; |
390 | mailimap_msg_att_item *item=0; | 390 | mailimap_msg_att_item *item=0; |
391 | clistcell *current,*c,*cf; | 391 | clistcell *current,*c,*cf; |
392 | mailimap_msg_att_dynamic*flist; | 392 | mailimap_msg_att_dynamic*flist; |
393 | mailimap_flag_fetch*cflag; | 393 | mailimap_flag_fetch*cflag; |
394 | int size; | 394 | int size; |
395 | QBitArray mFlags(7); | 395 | QBitArray mFlags(7); |
396 | QStringList addresslist; | 396 | QStringList addresslist; |
397 | 397 | ||
398 | if (!m_att) { | 398 | if (!m_att) { |
399 | return m; | 399 | return m; |
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 */ |
420 | mFlags.setBit(FLAG_FLAGGED); | 425 | mFlags.setBit(FLAG_FLAGGED); |
421 | break; | 426 | break; |
422 | case MAILIMAP_FLAG_DELETED: /* \Deleted flag */ | 427 | case MAILIMAP_FLAG_DELETED: /* \Deleted flag */ |
423 | mFlags.setBit(FLAG_DELETED); | 428 | mFlags.setBit(FLAG_DELETED); |
424 | break; | 429 | break; |
425 | case MAILIMAP_FLAG_SEEN: /* \Seen flag */ | 430 | case MAILIMAP_FLAG_SEEN: /* \Seen flag */ |
426 | mFlags.setBit(FLAG_SEEN); | 431 | mFlags.setBit(FLAG_SEEN); |
427 | break; | 432 | break; |
428 | case MAILIMAP_FLAG_DRAFT: /* \Draft flag */ | 433 | case MAILIMAP_FLAG_DRAFT: /* \Draft flag */ |
429 | mFlags.setBit(FLAG_DRAFT); | 434 | mFlags.setBit(FLAG_DRAFT); |
430 | break; | 435 | break; |
431 | case MAILIMAP_FLAG_KEYWORD: /* keyword flag */ | 436 | case MAILIMAP_FLAG_KEYWORD: /* keyword flag */ |
432 | break; | 437 | break; |
433 | case MAILIMAP_FLAG_EXTENSION: /* \extension flag */ | 438 | case MAILIMAP_FLAG_EXTENSION: /* \extension flag */ |
434 | break; | 439 | break; |
435 | default: | 440 | default: |
436 | break; | 441 | break; |
437 | } | 442 | } |
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 | } |
454 | } | 465 | } |
455 | if (head->env_to!=NULL) { | 466 | if (head->env_to!=NULL) { |
456 | addresslist = address_list_to_stringlist(head->env_to->to_list); | 467 | addresslist = address_list_to_stringlist(head->env_to->to_list); |
457 | m->setTo(addresslist); | 468 | m->setTo(addresslist); |
458 | } | 469 | } |
459 | if (head->env_cc!=NULL) { | 470 | if (head->env_cc!=NULL) { |
460 | addresslist = address_list_to_stringlist(head->env_cc->cc_list); | 471 | addresslist = address_list_to_stringlist(head->env_cc->cc_list); |
461 | m->setCC(addresslist); | 472 | m->setCC(addresslist); |
462 | } | 473 | } |
463 | if (head->env_bcc!=NULL) { | 474 | if (head->env_bcc!=NULL) { |
464 | addresslist = address_list_to_stringlist(head->env_bcc->bcc_list); | 475 | addresslist = address_list_to_stringlist(head->env_bcc->bcc_list); |
465 | m->setBcc(addresslist); | 476 | m->setBcc(addresslist); |
466 | } | 477 | } |
467 | /* reply to address, eg. email. */ | 478 | /* reply to address, eg. email. */ |
468 | if (head->env_reply_to!=NULL) { | 479 | if (head->env_reply_to!=NULL) { |
469 | addresslist = address_list_to_stringlist(head->env_reply_to->rt_list); | 480 | addresslist = address_list_to_stringlist(head->env_reply_to->rt_list); |
470 | if (addresslist.count()) { | 481 | if (addresslist.count()) { |
471 | m->setReplyto(addresslist.first()); | 482 | m->setReplyto(addresslist.first()); |
472 | } | 483 | } |
473 | } | 484 | } |
474 | if (head->env_in_reply_to!=NULL) { | 485 | if (head->env_in_reply_to!=NULL) { |
475 | QString h(head->env_in_reply_to); | 486 | QString h(head->env_in_reply_to); |
476 | while (h.length()>0 && h[0]=='<') { | 487 | while (h.length()>0 && h[0]=='<') { |
477 | h.remove(0,1); | 488 | h.remove(0,1); |
478 | } | 489 | } |
479 | while (h.length()>0 && h[h.length()-1]=='>') { | 490 | while (h.length()>0 && h[h.length()-1]=='>') { |
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)); |
493 | qDebug("time %s ",da.toString().latin1() ); | 504 | qDebug("time %s ",da.toString().latin1() ); |
494 | #endif | 505 | #endif |
495 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { | 506 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { |
496 | size = item->att_data.att_static->att_data.att_rfc822_size; | 507 | size = item->att_data.att_static->att_data.att_rfc822_size; |
497 | } | 508 | } |
498 | } | 509 | } |
499 | /* msg is already deleted */ | 510 | /* msg is already deleted */ |
500 | if (mFlags.testBit(FLAG_DELETED) && m) { | 511 | if (mFlags.testBit(FLAG_DELETED) && m) { |
501 | delete m; | 512 | delete m; |
502 | m = 0; | 513 | m = 0; |
503 | } | 514 | } |
504 | if (m) { | 515 | if (m) { |
505 | m->setFlags(mFlags); | 516 | m->setFlags(mFlags); |
506 | m->setMsgsize(size); | 517 | m->setMsgsize(size); |
507 | } | 518 | } |
508 | return m; | 519 | return m; |
509 | } | 520 | } |
510 | 521 | ||
511 | RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) | 522 | RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) |
512 | { | 523 | { |
513 | RecBodyP body = new RecBody(); | 524 | RecBodyP body = new RecBody(); |
514 | const char *mb; | 525 | const char *mb; |
515 | int err = MAILIMAP_NO_ERROR; | 526 | int err = MAILIMAP_NO_ERROR; |
516 | clist *result = 0; | 527 | clist *result = 0; |
517 | clistcell *current; | 528 | clistcell *current; |
518 | mailimap_fetch_att *fetchAtt = 0; | 529 | mailimap_fetch_att *fetchAtt = 0; |
519 | mailimap_fetch_type *fetchType = 0; | 530 | mailimap_fetch_type *fetchType = 0; |
520 | mailimap_set *set = 0; | 531 | mailimap_set *set = 0; |
521 | mailimap_body*body_desc = 0; | 532 | mailimap_body*body_desc = 0; |
522 | 533 | ||
523 | mb = mail->getMbox().latin1(); | 534 | mb = mail->getMbox().latin1(); |
524 | 535 | ||
525 | login(); | 536 | login(); |
526 | if (!m_imap) { | 537 | if (!m_imap) { |
527 | return body; | 538 | return body; |
528 | } | 539 | } |
529 | err = selectMbox(mail->getMbox()); | 540 | err = selectMbox(mail->getMbox()); |
530 | if ( err != MAILIMAP_NO_ERROR ) { | 541 | if ( err != MAILIMAP_NO_ERROR ) { |
531 | return body; | 542 | return body; |
532 | } | 543 | } |
533 | 544 | ||
534 | /* the range has to start at 1!!! not with 0!!!! */ | 545 | /* the range has to start at 1!!! not with 0!!!! */ |
535 | set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() ); | 546 | set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() ); |
536 | fetchAtt = mailimap_fetch_att_new_bodystructure(); | 547 | fetchAtt = mailimap_fetch_att_new_bodystructure(); |
537 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 548 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
538 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 549 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
539 | mailimap_set_free( set ); | 550 | mailimap_set_free( set ); |
540 | mailimap_fetch_type_free( fetchType ); | 551 | mailimap_fetch_type_free( fetchType ); |
541 | 552 | ||
542 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 553 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
543 | mailimap_msg_att * msg_att; | 554 | mailimap_msg_att * msg_att; |
544 | msg_att = (mailimap_msg_att*)current->data; | 555 | msg_att = (mailimap_msg_att*)current->data; |
545 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 556 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
546 | QValueList<int> path; | 557 | QValueList<int> path; |
547 | body_desc = item->att_data.att_static->att_data.att_body; | 558 | body_desc = item->att_data.att_static->att_data.att_body; |
548 | traverseBody(mail,body_desc,body,0,path); | 559 | traverseBody(mail,body_desc,body,0,path); |
549 | } else { | 560 | } else { |
550 | //odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; | 561 | //odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; |
551 | } | 562 | } |
552 | if (result) mailimap_fetch_list_free(result); | 563 | if (result) mailimap_fetch_list_free(result); |
553 | return body; | 564 | return body; |
554 | } | 565 | } |
555 | 566 | ||
556 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 567 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |
557 | { | 568 | { |
558 | QStringList l; | 569 | QStringList l; |
559 | QString from; | 570 | QString from; |
560 | bool named_from; | 571 | bool named_from; |
561 | clistcell *current = NULL; | 572 | clistcell *current = NULL; |
562 | mailimap_address * current_address=NULL; | 573 | mailimap_address * current_address=NULL; |
563 | if (!list) { | 574 | if (!list) { |
564 | return l; | 575 | return l; |
565 | } | 576 | } |
566 | unsigned int count = 0; | 577 | unsigned int count = 0; |
567 | for (current=clist_begin(list);current!= NULL;current=clist_next(current)) { | 578 | for (current=clist_begin(list);current!= NULL;current=clist_next(current)) { |
568 | from = ""; | 579 | from = ""; |
569 | named_from = false; | 580 | named_from = false; |
570 | current_address=(mailimap_address*)current->data; | 581 | current_address=(mailimap_address*)current->data; |
571 | if (current_address->ad_personal_name){ | 582 | if (current_address->ad_personal_name){ |
572 | from+=convert_String((const char*)current_address->ad_personal_name); | 583 | from+=convert_String((const char*)current_address->ad_personal_name); |
573 | from+=" "; | 584 | from+=" "; |
574 | named_from = true; | 585 | named_from = true; |
575 | } | 586 | } |
576 | if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) { | 587 | if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) { |
577 | from+="<"; | 588 | from+="<"; |
578 | } | 589 | } |
579 | if (current_address->ad_mailbox_name) { | 590 | if (current_address->ad_mailbox_name) { |
580 | from+=QString(current_address->ad_mailbox_name); | 591 | from+=QString(current_address->ad_mailbox_name); |
581 | from+="@"; | 592 | from+="@"; |
582 | } | 593 | } |