Diffstat (limited to 'noncore/net/mail/libmailwrapper/imapwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index ad95384..a4e6228 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -392,6 +392,9 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mai | |||
392 | case MAILIMAP_BODY_TYPE_1PART_MSG: | 392 | case MAILIMAP_BODY_TYPE_1PART_MSG: |
393 | path.append(1); | 393 | path.append(1); |
394 | body_text = fetchPart(mail,path,true); | 394 | body_text = fetchPart(mail,path,true); |
395 | if (singlePart.Encoding()=="quoted-printable") { | ||
396 | body_text = decode_quoted_printable(body_text.latin1()); | ||
397 | } | ||
395 | target_body.setBodytext(body_text); | 398 | target_body.setBodytext(body_text); |
396 | target_body.setDescription(singlePart); | 399 | target_body.setDescription(singlePart); |
397 | break; | 400 | break; |
@@ -399,6 +402,9 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mai | |||
399 | qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text); | 402 | qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text); |
400 | path.append(1); | 403 | path.append(1); |
401 | body_text = fetchPart(mail,path,true); | 404 | body_text = fetchPart(mail,path,true); |
405 | if (singlePart.Encoding()=="quoted-printable") { | ||
406 | body_text = decode_quoted_printable(body_text.latin1()); | ||
407 | } | ||
402 | target_body.setBodytext(body_text); | 408 | target_body.setBodytext(body_text); |
403 | target_body.setDescription(singlePart); | 409 | target_body.setDescription(singlePart); |
404 | break; | 410 | break; |
@@ -455,7 +461,7 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
455 | return l; | 461 | return l; |
456 | } | 462 | } |
457 | 463 | ||
458 | QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call) | 464 | QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call,const QString&enc) |
459 | { | 465 | { |
460 | QString body(""); | 466 | QString body(""); |
461 | const char*mb; | 467 | const char*mb; |
@@ -507,7 +513,11 @@ QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,boo | |||
507 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; | 513 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; |
508 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; | 514 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; |
509 | if (text) { | 515 | if (text) { |
516 | if (enc=="quoted-printable") { | ||
517 | body = decode_quoted_printable(text); | ||
518 | } else { | ||
510 | body = QString(text); | 519 | body = QString(text); |
520 | } | ||
511 | free(text); | 521 | free(text); |
512 | } else { | 522 | } else { |
513 | body = ""; | 523 | body = ""; |
@@ -547,7 +557,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai | |||
547 | clist.append(count); | 557 | clist.append(count); |
548 | /* important: Check for is NULL 'cause a body can be empty! */ | 558 | /* important: Check for is NULL 'cause a body can be empty! */ |
549 | if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { | 559 | if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { |
550 | QString body_text = fetchPart(mail,clist,true); | 560 | QString body_text = fetchPart(mail,clist,true,currentPart.Encoding()); |
551 | target_body.setDescription(currentPart); | 561 | target_body.setDescription(currentPart); |
552 | target_body.setBodytext(body_text); | 562 | target_body.setBodytext(body_text); |
553 | } else { | 563 | } else { |
@@ -705,7 +715,7 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which) | |||
705 | 715 | ||
706 | QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part) | 716 | QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part) |
707 | { | 717 | { |
708 | return fetchPart(mail,part.Positionlist(),false); | 718 | return fetchPart(mail,part.Positionlist(),false,part.Encoding()); |
709 | } | 719 | } |
710 | 720 | ||
711 | void IMAPwrapper::deleteMail(const RecMail&mail) | 721 | void IMAPwrapper::deleteMail(const RecMail&mail) |