-rw-r--r-- | kmicromail/libetpan/imap/mailimap_parser.c | 22 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 67 | ||||
-rw-r--r-- | kmicromail/viewmailbase.cpp | 2 |
3 files changed, 57 insertions, 34 deletions
diff --git a/kmicromail/libetpan/imap/mailimap_parser.c b/kmicromail/libetpan/imap/mailimap_parser.c index 1c2ecde..560e58a 100644 --- a/kmicromail/libetpan/imap/mailimap_parser.c +++ b/kmicromail/libetpan/imap/mailimap_parser.c | |||
@@ -2386,34 +2386,52 @@ mailimap_body_fld_enc_parse(mailstream * fd, MMAPString * buffer, | |||
2386 | int r; | 2386 | int r; |
2387 | int res; | 2387 | int res; |
2388 | 2388 | ||
2389 | cur_token = * index; | 2389 | cur_token = * index; |
2390 | 2390 | ||
2391 | r = mailimap_body_fld_known_enc_parse(fd, buffer, &cur_token, | 2391 | r = mailimap_body_fld_known_enc_parse(fd, buffer, &cur_token, |
2392 | &type, progr_rate, progr_fun); | 2392 | &type, progr_rate, progr_fun); |
2393 | if (r == MAILIMAP_NO_ERROR) { | 2393 | if (r == MAILIMAP_NO_ERROR) { |
2394 | value = NULL; | 2394 | value = NULL; |
2395 | } | 2395 | } |
2396 | else if (r == MAILIMAP_ERROR_PARSE) { | 2396 | else if (r == MAILIMAP_ERROR_PARSE) { |
2397 | type = MAILIMAP_BODY_FLD_ENC_OTHER; | 2397 | type = MAILIMAP_BODY_FLD_ENC_OTHER; |
2398 | 2398 | ||
2399 | r = mailimap_string_parse(fd, buffer, &cur_token, &value, NULL, | 2399 | r = mailimap_string_parse(fd, buffer, &cur_token, &value, NULL, |
2400 | progr_rate, progr_fun); | 2400 | progr_rate, progr_fun); |
2401 | if (r != MAILIMAP_NO_ERROR) { | 2401 | if (r != MAILIMAP_NO_ERROR) { |
2402 | res = r; | 2402 | // LR start |
2403 | goto err; | 2403 | // accept NIL and set type to utf8 |
2404 | int ret = r; | ||
2405 | r = mailimap_char_parse(fd, buffer, &cur_token, 'N'); | ||
2406 | if (r == MAILIMAP_NO_ERROR) { | ||
2407 | r = mailimap_char_parse(fd, buffer, &cur_token, 'I'); | ||
2408 | if (r == MAILIMAP_NO_ERROR) { | ||
2409 | r = mailimap_char_parse(fd, buffer, &cur_token, 'L'); | ||
2410 | if (r == MAILIMAP_NO_ERROR) { | ||
2411 | type = 4; | ||
2412 | ret = MAILIMAP_NO_ERROR; | ||
2413 | value = NULL; | ||
2414 | } | ||
2415 | } | ||
2416 | } | ||
2417 | if ( ret != MAILIMAP_NO_ERROR ) { | ||
2418 | res = ret; | ||
2419 | goto err; | ||
2420 | } | ||
2421 | // LR end | ||
2404 | } | 2422 | } |
2405 | } | 2423 | } |
2406 | else { | 2424 | else { |
2407 | res = r; | 2425 | res = r; |
2408 | goto err; | 2426 | goto err; |
2409 | } | 2427 | } |
2410 | 2428 | ||
2411 | body_fld_enc = mailimap_body_fld_enc_new(type, value); | 2429 | body_fld_enc = mailimap_body_fld_enc_new(type, value); |
2412 | if (body_fld_enc == NULL) { | 2430 | if (body_fld_enc == NULL) { |
2413 | res = MAILIMAP_ERROR_MEMORY; | 2431 | res = MAILIMAP_ERROR_MEMORY; |
2414 | goto value_free; | 2432 | goto value_free; |
2415 | } | 2433 | } |
2416 | 2434 | ||
2417 | * result = body_fld_enc; | 2435 | * result = body_fld_enc; |
2418 | * index = cur_token; | 2436 | * index = cur_token; |
2419 | 2437 | ||
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 | |||
@@ -423,81 +423,86 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
423 | if (!m_att) { | 423 | if (!m_att) { |
424 | return m; | 424 | return m; |
425 | } | 425 | } |
426 | m = new RecMail(); | 426 | m = new RecMail(); |
427 | for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) { | 427 | for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) { |
428 | current = c; | 428 | current = c; |
429 | size = 0; | 429 | size = 0; |
430 | item = (mailimap_msg_att_item*)current->data; | 430 | item = (mailimap_msg_att_item*)current->data; |
431 | if ( !item ) | 431 | if ( !item ) |
432 | continue; | 432 | continue; |
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 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { | 444 | else { |
445 | switch (cflag->fl_flag->fl_type) { | 445 | if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) { |
446 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ | 446 | switch (cflag->fl_flag->fl_type) { |
447 | mFlags.setBit(FLAG_ANSWERED); | 447 | case MAILIMAP_FLAG_ANSWERED: /* \Answered flag */ |
448 | break; | 448 | mFlags.setBit(FLAG_ANSWERED); |
449 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ | 449 | break; |
450 | mFlags.setBit(FLAG_FLAGGED); | 450 | case MAILIMAP_FLAG_FLAGGED: /* \Flagged flag */ |
451 | break; | 451 | mFlags.setBit(FLAG_FLAGGED); |
452 | case MAILIMAP_FLAG_DELETED: /* \Deleted flag */ | 452 | break; |
453 | mFlags.setBit(FLAG_DELETED); | 453 | case MAILIMAP_FLAG_DELETED: /* \Deleted flag */ |
454 | break; | 454 | mFlags.setBit(FLAG_DELETED); |
455 | case MAILIMAP_FLAG_SEEN: /* \Seen flag */ | 455 | break; |
456 | mFlags.setBit(FLAG_SEEN); | 456 | case MAILIMAP_FLAG_SEEN: /* \Seen flag */ |
457 | break; | 457 | mFlags.setBit(FLAG_SEEN); |
458 | case MAILIMAP_FLAG_DRAFT: /* \Draft flag */ | 458 | break; |
459 | mFlags.setBit(FLAG_DRAFT); | 459 | case MAILIMAP_FLAG_DRAFT: /* \Draft flag */ |
460 | break; | 460 | mFlags.setBit(FLAG_DRAFT); |
461 | case MAILIMAP_FLAG_KEYWORD: /* keyword flag */ | 461 | break; |
462 | break; | 462 | case MAILIMAP_FLAG_KEYWORD: /* keyword flag */ |
463 | case MAILIMAP_FLAG_EXTENSION: /* \extension flag */ | 463 | break; |
464 | break; | 464 | case MAILIMAP_FLAG_EXTENSION: /* \extension flag */ |
465 | default: | 465 | break; |
466 | break; | 466 | default: |
467 | break; | ||
468 | } | ||
469 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { | ||
470 | mFlags.setBit(FLAG_RECENT); | ||
471 | } | ||
467 | } | 472 | } |
468 | } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) { | ||
469 | mFlags.setBit(FLAG_RECENT); | ||
470 | } | 473 | } |
471 | } | 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; |
478 | if ( head == NULL ) | 482 | if ( head == NULL ) |
479 | continue; | 483 | continue; |
480 | if ( head->env_date != NULL ) { | 484 | if ( head->env_date != NULL ) { |
481 | m->setDate(head->env_date); | 485 | m->setDate(head->env_date); |
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); |
494 | } | 499 | } |
495 | m->setDate( ret ); | 500 | m->setDate( ret ); |
496 | char tmp[20]; | 501 | char tmp[20]; |
497 | snprintf( tmp, 20, "%04i-%02i-%02i %02i:%02i:%02i", | 502 | snprintf( tmp, 20, "%04i-%02i-%02i %02i:%02i:%02i", |
498 | dt.date().year(),dt.date().month(), dt.date().day(), dt.time().hour(), dt.time().minute(), dt.time().second() ); | 503 | dt.date().year(),dt.date().month(), dt.date().day(), dt.time().hour(), dt.time().minute(), dt.time().second() ); |
499 | //qDebug("%d iso %s %s ", date->dt_zone, tmp, head->env_date); | 504 | //qDebug("%d iso %s %s ", date->dt_zone, tmp, head->env_date); |
500 | m->setIsoDate( QString( tmp ) ); | 505 | m->setIsoDate( QString( tmp ) ); |
501 | mailimf_date_time_free ( date ); | 506 | mailimf_date_time_free ( date ); |
502 | } else { | 507 | } else { |
503 | m->setIsoDate(head->env_date); | 508 | m->setIsoDate(head->env_date); |
@@ -594,33 +599,33 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail) | |||
594 | /* the range has to start at 1!!! not with 0!!!! */ | 599 | /* the range has to start at 1!!! not with 0!!!! */ |
595 | set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() ); | 600 | set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() ); |
596 | fetchAtt = mailimap_fetch_att_new_bodystructure(); | 601 | fetchAtt = mailimap_fetch_att_new_bodystructure(); |
597 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 602 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
598 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 603 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
599 | mailimap_set_free( set ); | 604 | mailimap_set_free( set ); |
600 | mailimap_fetch_type_free( fetchType ); | 605 | mailimap_fetch_type_free( fetchType ); |
601 | 606 | ||
602 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 607 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
603 | mailimap_msg_att * msg_att; | 608 | mailimap_msg_att * msg_att; |
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) |
617 | { | 622 | { |
618 | QStringList l; | 623 | QStringList l; |
619 | QString from; | 624 | QString from; |
620 | bool named_from; | 625 | bool named_from; |
621 | clistcell *current = NULL; | 626 | clistcell *current = NULL; |
622 | mailimap_address * current_address=NULL; | 627 | mailimap_address * current_address=NULL; |
623 | if (!list) { | 628 | if (!list) { |
624 | return l; | 629 | return l; |
625 | } | 630 | } |
626 | unsigned int count = 0; | 631 | unsigned int count = 0; |
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index c4731a7..d21696a 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp | |||
@@ -39,33 +39,33 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
39 | attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true); | 39 | attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true); |
40 | attachbutton->addTo(toolbar); | 40 | attachbutton->addTo(toolbar); |
41 | attachbutton->addTo(mailmenu); | 41 | attachbutton->addTo(mailmenu); |
42 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); | 42 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); |
43 | 43 | ||
44 | 44 | ||
45 | showHtml = new QAction( i18n( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); | 45 | showHtml = new QAction( i18n( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); |
46 | showHtml->addTo( toolbar ); | 46 | showHtml->addTo( toolbar ); |
47 | showHtml->addTo( mailmenu ); | 47 | showHtml->addTo( mailmenu ); |
48 | 48 | ||
49 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); | 49 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); |
50 | deleteMail->addTo(toolbar); | 50 | deleteMail->addTo(toolbar); |
51 | deleteMail->addTo(mailmenu); | 51 | deleteMail->addTo(mailmenu); |
52 | 52 | ||
53 | 53 | ||
54 | 54 | ||
55 | nextMail = new QAction(i18n("Show next mail"),SmallIcon("add"), 0, 0, this); | 55 | nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this); |
56 | QLabel *spacer = new QLabel(toolbar); | 56 | QLabel *spacer = new QLabel(toolbar); |
57 | nextMail->addTo(toolbar); | 57 | nextMail->addTo(toolbar); |
58 | nextMail->addTo(mailmenu); | 58 | nextMail->addTo(mailmenu); |
59 | 59 | ||
60 | 60 | ||
61 | 61 | ||
62 | 62 | ||
63 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); | 63 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); |
64 | //QLabel *spacer = new QLabel(toolbar); | 64 | //QLabel *spacer = new QLabel(toolbar); |
65 | spacer->setBackgroundMode(QWidget::PaletteButton); | 65 | spacer->setBackgroundMode(QWidget::PaletteButton); |
66 | toolbar->setStretchableWidget(spacer); | 66 | toolbar->setStretchableWidget(spacer); |
67 | closeMail->addTo(toolbar); | 67 | closeMail->addTo(toolbar); |
68 | closeMail->addTo(mailmenu); | 68 | closeMail->addTo(mailmenu); |
69 | QVBox *view = new QVBox(this); | 69 | QVBox *view = new QVBox(this); |
70 | setCentralWidget(view); | 70 | setCentralWidget(view); |
71 | 71 | ||