author | alwin <alwin> | 2004-01-02 01:12:52 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-01-02 01:12:52 (UTC) |
commit | 8bd5873a04bc8c506694d00be4111549d969fd2a (patch) (unidiff) | |
tree | 2e6f601668916e3d382dba1003b714362cb81179 /noncore | |
parent | 31df13e3d5eecef960e267b7ad4f7ad98fa28357 (diff) | |
download | opie-8bd5873a04bc8c506694d00be4111549d969fd2a.zip opie-8bd5873a04bc8c506694d00be4111549d969fd2a.tar.gz opie-8bd5873a04bc8c506694d00be4111549d969fd2a.tar.bz2 |
- some more usefull failure message while login
- cleaned up the code for parsing mails, use only one routine, message/rfc822 parts
are parsed, too.
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 148 | ||||
-rw-r--r-- | noncore/net/mail/imapwrapper.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 148 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 5 |
4 files changed, 128 insertions, 178 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 406c57c..f7e93aa 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp | |||
@@ -62,2 +62,3 @@ void IMAPwrapper::login() | |||
62 | m_imap = mailimap_new( 20, &imap_progress ); | 62 | m_imap = mailimap_new( 20, &imap_progress ); |
63 | |||
63 | /* connect */ | 64 | /* connect */ |
@@ -72,3 +73,9 @@ void IMAPwrapper::login() | |||
72 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | 73 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { |
73 | Global::statusMessage(tr("error connecting imap server: %1").arg(m_imap->imap_response)); | 74 | QString failure = ""; |
75 | if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { | ||
76 | failure="Connection refused"; | ||
77 | } else { | ||
78 | failure="Unknown failure"; | ||
79 | } | ||
80 | Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); | ||
74 | mailimap_free( m_imap ); | 81 | mailimap_free( m_imap ); |
@@ -402,9 +409,5 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
402 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 409 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
410 | QValueList<int> path; | ||
403 | body_desc = item->att_data.att_static->att_data.att_body; | 411 | body_desc = item->att_data.att_static->att_data.att_body; |
404 | if (body_desc->bd_type==MAILIMAP_BODY_1PART) { | 412 | traverseBody(mail,body_desc,body,0,path); |
405 | searchBodyText(mail,body_desc->bd_data.bd_body_1part,body); | ||
406 | } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) { | ||
407 | qDebug("Mulitpart mail"); | ||
408 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); | ||
409 | } | ||
410 | } else { | 413 | } else { |
@@ -416,40 +419,2 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
416 | 419 | ||
417 | /* this routine is just called when the mail has only ONE part. | ||
418 | for filling the parts of a multi-part-message there are other | ||
419 | routines 'cause we can not simply fetch the whole body. */ | ||
420 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body) | ||
421 | { | ||
422 | if (!mailDescription) { | ||
423 | return; | ||
424 | } | ||
425 | QString sub,body_text; | ||
426 | RecPart singlePart; | ||
427 | QValueList<int> path; | ||
428 | fillSinglePart(singlePart,mailDescription); | ||
429 | switch (mailDescription->bd_type) { | ||
430 | case MAILIMAP_BODY_TYPE_1PART_MSG: | ||
431 | path.append(1); | ||
432 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
433 | target_body.setBodytext(body_text); | ||
434 | target_body.setDescription(singlePart); | ||
435 | break; | ||
436 | case MAILIMAP_BODY_TYPE_1PART_TEXT: | ||
437 | qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text); | ||
438 | path.append(1); | ||
439 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
440 | target_body.setBodytext(body_text); | ||
441 | target_body.setDescription(singlePart); | ||
442 | break; | ||
443 | case MAILIMAP_BODY_TYPE_1PART_BASIC: | ||
444 | qDebug("Single attachment"); | ||
445 | target_body.setBodytext(""); | ||
446 | target_body.addPart(singlePart); | ||
447 | break; | ||
448 | default: | ||
449 | break; | ||
450 | } | ||
451 | |||
452 | return; | ||
453 | } | ||
454 | |||
455 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 420 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |
@@ -471,3 +436,2 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
471 | from+=convert_String((const char*)current_address->ad_personal_name); | 436 | from+=convert_String((const char*)current_address->ad_personal_name); |
472 | //from+=QString(current_address->ad_personal_name); | ||
473 | from+=" "; | 437 | from+=" "; |
@@ -559,42 +523,57 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
559 | 523 | ||
560 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) | 524 | /* current_recursion is for recursive calls. |
525 | current_count means the position inside the internal loop! */ | ||
526 | void IMAPwrapper::traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body, | ||
527 | int current_recursion,QValueList<int>recList,int current_count) | ||
561 | { | 528 | { |
562 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ | 529 | if (!body || current_recursion>=10) { |
563 | if (!mailDescription||current_recursion==10) { | ||
564 | return; | 530 | return; |
565 | } | 531 | } |
566 | clistcell*current; | 532 | ++current_count; |
567 | mailimap_body*current_body; | 533 | switch (body->bd_type) { |
568 | unsigned int count = 0; | 534 | case MAILIMAP_BODY_1PART: |
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | 535 | { |
570 | /* the point in the message */ | 536 | QValueList<int>countlist = recList; |
571 | ++count; | 537 | countlist.append(current_count); |
572 | current_body = (mailimap_body*)current->data; | 538 | RecPart currentPart; |
573 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | 539 | mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part; |
574 | QValueList<int>countlist = recList; | 540 | QString id(""); |
575 | countlist.append(count); | 541 | currentPart.setPositionlist(countlist); |
576 | searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist); | 542 | for (unsigned int j = 0; j < countlist.count();++j) { |
577 | } else if (current_body->bd_type==MAILIMAP_BODY_1PART){ | 543 | id+=(j>0?" ":""); |
578 | RecPart currentPart; | 544 | id+=QString("%1").arg(countlist[j]); |
579 | fillSinglePart(currentPart,current_body->bd_data.bd_body_1part); | 545 | } |
580 | QValueList<int>countlist = recList; | 546 | qDebug("ID = %s",id.latin1()); |
581 | countlist.append(count); | 547 | currentPart.setIdentifier(id); |
582 | /* important: Check for is NULL 'cause a body can be empty! */ | 548 | fillSinglePart(currentPart,part1); |
583 | if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { | 549 | /* important: Check for is NULL 'cause a body can be empty! |
584 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); | 550 | And we put it only into the mail if it is the FIRST part */ |
585 | target_body.setDescription(currentPart); | 551 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body.Bodytext().isNull() && countlist[0]==1) { |
586 | target_body.setBodytext(body_text); | 552 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); |
587 | } else { | 553 | target_body.setDescription(currentPart); |
588 | QString id(""); | 554 | target_body.setBodytext(body_text); |
589 | for (unsigned int j = 0; j < countlist.count();++j) { | 555 | } else { |
590 | id+=(j>0?" ":""); | 556 | target_body.addPart(currentPart); |
591 | id+=QString("%1").arg(countlist[j]); | 557 | } |
592 | } | 558 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) { |
593 | qDebug("ID= %s",id.latin1()); | 559 | traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist); |
594 | currentPart.setIdentifier(id); | 560 | } |
595 | currentPart.setPositionlist(countlist); | 561 | } |
596 | target_body.addPart(currentPart); | 562 | break; |
597 | } | 563 | case MAILIMAP_BODY_MPART: |
564 | { | ||
565 | clistcell*current=0; | ||
566 | mailimap_body*current_body=0; | ||
567 | unsigned int ccount = current_count-1; | ||
568 | mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart; | ||
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | ||
570 | current_body = (mailimap_body*)current->data; | ||
571 | traverseBody(mail,current_body,target_body,current_recursion+1,recList,ccount); | ||
572 | ++ccount; | ||
598 | } | 573 | } |
599 | } | 574 | } |
575 | break; | ||
576 | default: | ||
577 | break; | ||
578 | } | ||
600 | } | 579 | } |
@@ -615,2 +594,3 @@ void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*De | |||
615 | case MAILIMAP_BODY_TYPE_1PART_MSG: | 594 | case MAILIMAP_BODY_TYPE_1PART_MSG: |
595 | target_part.setType("message"); | ||
616 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); | 596 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); |
@@ -639,9 +619,5 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w | |||
639 | } | 619 | } |
640 | // QString sub; | 620 | target_part.setSubtype("rfc822"); |
641 | // sub = which->bd_media_text; | ||
642 | // target_part.setSubtype(sub.lower()); | ||
643 | qDebug("Message part"); | 621 | qDebug("Message part"); |
644 | /* we set this type to text/plain */ | 622 | /* we set this type to text/plain */ |
645 | target_part.setType("text"); | ||
646 | target_part.setSubtype("plain"); | ||
647 | target_part.setLines(which->bd_lines); | 623 | target_part.setLines(which->bd_lines); |
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h index 9b20288..e5846f8 100644 --- a/noncore/net/mail/imapwrapper.h +++ b/noncore/net/mail/imapwrapper.h | |||
@@ -9,2 +9,3 @@ | |||
9 | struct mailimap; | 9 | struct mailimap; |
10 | struct mailimap_body; | ||
10 | struct mailimap_body_type_1part; | 11 | struct mailimap_body_type_1part; |
@@ -49,5 +50,2 @@ protected: | |||
49 | 50 | ||
50 | void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); | ||
51 | void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>()); | ||
52 | |||
53 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); | 51 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); |
@@ -56,2 +54,3 @@ protected: | |||
56 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); | 54 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); |
55 | void traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=0); | ||
57 | 56 | ||
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 406c57c..f7e93aa 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -62,2 +62,3 @@ void IMAPwrapper::login() | |||
62 | m_imap = mailimap_new( 20, &imap_progress ); | 62 | m_imap = mailimap_new( 20, &imap_progress ); |
63 | |||
63 | /* connect */ | 64 | /* connect */ |
@@ -72,3 +73,9 @@ void IMAPwrapper::login() | |||
72 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | 73 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { |
73 | Global::statusMessage(tr("error connecting imap server: %1").arg(m_imap->imap_response)); | 74 | QString failure = ""; |
75 | if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { | ||
76 | failure="Connection refused"; | ||
77 | } else { | ||
78 | failure="Unknown failure"; | ||
79 | } | ||
80 | Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); | ||
74 | mailimap_free( m_imap ); | 81 | mailimap_free( m_imap ); |
@@ -402,9 +409,5 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
402 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 409 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
410 | QValueList<int> path; | ||
403 | body_desc = item->att_data.att_static->att_data.att_body; | 411 | body_desc = item->att_data.att_static->att_data.att_body; |
404 | if (body_desc->bd_type==MAILIMAP_BODY_1PART) { | 412 | traverseBody(mail,body_desc,body,0,path); |
405 | searchBodyText(mail,body_desc->bd_data.bd_body_1part,body); | ||
406 | } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) { | ||
407 | qDebug("Mulitpart mail"); | ||
408 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); | ||
409 | } | ||
410 | } else { | 413 | } else { |
@@ -416,40 +419,2 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
416 | 419 | ||
417 | /* this routine is just called when the mail has only ONE part. | ||
418 | for filling the parts of a multi-part-message there are other | ||
419 | routines 'cause we can not simply fetch the whole body. */ | ||
420 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body) | ||
421 | { | ||
422 | if (!mailDescription) { | ||
423 | return; | ||
424 | } | ||
425 | QString sub,body_text; | ||
426 | RecPart singlePart; | ||
427 | QValueList<int> path; | ||
428 | fillSinglePart(singlePart,mailDescription); | ||
429 | switch (mailDescription->bd_type) { | ||
430 | case MAILIMAP_BODY_TYPE_1PART_MSG: | ||
431 | path.append(1); | ||
432 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
433 | target_body.setBodytext(body_text); | ||
434 | target_body.setDescription(singlePart); | ||
435 | break; | ||
436 | case MAILIMAP_BODY_TYPE_1PART_TEXT: | ||
437 | qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text); | ||
438 | path.append(1); | ||
439 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
440 | target_body.setBodytext(body_text); | ||
441 | target_body.setDescription(singlePart); | ||
442 | break; | ||
443 | case MAILIMAP_BODY_TYPE_1PART_BASIC: | ||
444 | qDebug("Single attachment"); | ||
445 | target_body.setBodytext(""); | ||
446 | target_body.addPart(singlePart); | ||
447 | break; | ||
448 | default: | ||
449 | break; | ||
450 | } | ||
451 | |||
452 | return; | ||
453 | } | ||
454 | |||
455 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 420 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |
@@ -471,3 +436,2 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
471 | from+=convert_String((const char*)current_address->ad_personal_name); | 436 | from+=convert_String((const char*)current_address->ad_personal_name); |
472 | //from+=QString(current_address->ad_personal_name); | ||
473 | from+=" "; | 437 | from+=" "; |
@@ -559,42 +523,57 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
559 | 523 | ||
560 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) | 524 | /* current_recursion is for recursive calls. |
525 | current_count means the position inside the internal loop! */ | ||
526 | void IMAPwrapper::traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body, | ||
527 | int current_recursion,QValueList<int>recList,int current_count) | ||
561 | { | 528 | { |
562 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ | 529 | if (!body || current_recursion>=10) { |
563 | if (!mailDescription||current_recursion==10) { | ||
564 | return; | 530 | return; |
565 | } | 531 | } |
566 | clistcell*current; | 532 | ++current_count; |
567 | mailimap_body*current_body; | 533 | switch (body->bd_type) { |
568 | unsigned int count = 0; | 534 | case MAILIMAP_BODY_1PART: |
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | 535 | { |
570 | /* the point in the message */ | 536 | QValueList<int>countlist = recList; |
571 | ++count; | 537 | countlist.append(current_count); |
572 | current_body = (mailimap_body*)current->data; | 538 | RecPart currentPart; |
573 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | 539 | mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part; |
574 | QValueList<int>countlist = recList; | 540 | QString id(""); |
575 | countlist.append(count); | 541 | currentPart.setPositionlist(countlist); |
576 | searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist); | 542 | for (unsigned int j = 0; j < countlist.count();++j) { |
577 | } else if (current_body->bd_type==MAILIMAP_BODY_1PART){ | 543 | id+=(j>0?" ":""); |
578 | RecPart currentPart; | 544 | id+=QString("%1").arg(countlist[j]); |
579 | fillSinglePart(currentPart,current_body->bd_data.bd_body_1part); | 545 | } |
580 | QValueList<int>countlist = recList; | 546 | qDebug("ID = %s",id.latin1()); |
581 | countlist.append(count); | 547 | currentPart.setIdentifier(id); |
582 | /* important: Check for is NULL 'cause a body can be empty! */ | 548 | fillSinglePart(currentPart,part1); |
583 | if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { | 549 | /* important: Check for is NULL 'cause a body can be empty! |
584 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); | 550 | And we put it only into the mail if it is the FIRST part */ |
585 | target_body.setDescription(currentPart); | 551 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body.Bodytext().isNull() && countlist[0]==1) { |
586 | target_body.setBodytext(body_text); | 552 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); |
587 | } else { | 553 | target_body.setDescription(currentPart); |
588 | QString id(""); | 554 | target_body.setBodytext(body_text); |
589 | for (unsigned int j = 0; j < countlist.count();++j) { | 555 | } else { |
590 | id+=(j>0?" ":""); | 556 | target_body.addPart(currentPart); |
591 | id+=QString("%1").arg(countlist[j]); | 557 | } |
592 | } | 558 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) { |
593 | qDebug("ID= %s",id.latin1()); | 559 | traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist); |
594 | currentPart.setIdentifier(id); | 560 | } |
595 | currentPart.setPositionlist(countlist); | 561 | } |
596 | target_body.addPart(currentPart); | 562 | break; |
597 | } | 563 | case MAILIMAP_BODY_MPART: |
564 | { | ||
565 | clistcell*current=0; | ||
566 | mailimap_body*current_body=0; | ||
567 | unsigned int ccount = current_count-1; | ||
568 | mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart; | ||
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | ||
570 | current_body = (mailimap_body*)current->data; | ||
571 | traverseBody(mail,current_body,target_body,current_recursion+1,recList,ccount); | ||
572 | ++ccount; | ||
598 | } | 573 | } |
599 | } | 574 | } |
575 | break; | ||
576 | default: | ||
577 | break; | ||
578 | } | ||
600 | } | 579 | } |
@@ -615,2 +594,3 @@ void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*De | |||
615 | case MAILIMAP_BODY_TYPE_1PART_MSG: | 594 | case MAILIMAP_BODY_TYPE_1PART_MSG: |
595 | target_part.setType("message"); | ||
616 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); | 596 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); |
@@ -639,9 +619,5 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w | |||
639 | } | 619 | } |
640 | // QString sub; | 620 | target_part.setSubtype("rfc822"); |
641 | // sub = which->bd_media_text; | ||
642 | // target_part.setSubtype(sub.lower()); | ||
643 | qDebug("Message part"); | 621 | qDebug("Message part"); |
644 | /* we set this type to text/plain */ | 622 | /* we set this type to text/plain */ |
645 | target_part.setType("text"); | ||
646 | target_part.setSubtype("plain"); | ||
647 | target_part.setLines(which->bd_lines); | 623 | target_part.setLines(which->bd_lines); |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 9b20288..e5846f8 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h | |||
@@ -9,2 +9,3 @@ | |||
9 | struct mailimap; | 9 | struct mailimap; |
10 | struct mailimap_body; | ||
10 | struct mailimap_body_type_1part; | 11 | struct mailimap_body_type_1part; |
@@ -49,5 +50,2 @@ protected: | |||
49 | 50 | ||
50 | void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); | ||
51 | void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>()); | ||
52 | |||
53 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); | 51 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); |
@@ -56,2 +54,3 @@ protected: | |||
56 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); | 54 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); |
55 | void traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=0); | ||
57 | 56 | ||