Merged keysync
authorEdouard Tisserant <edouard@pep-project.org>
Mon, 03 Oct 2016 22:26:48 +0200
branchkeysync
changeset 1238191fe41c2513
parent 1237 18438a7595d7
parent 1219 43a51b1ed6d5
child 1239 641f4e51e0fb
Merged
     1.1 --- a/src/message_api.h	Mon Oct 03 22:22:36 2016 +0200
     1.2 +++ b/src/message_api.h	Mon Oct 03 22:26:48 2016 +0200
     1.3 @@ -135,7 +135,7 @@
     1.4  //      src (in)            message to decrypt
     1.5  //      dst (out)           pointer to new decrypted message or NULL on failure
     1.6  //      keylist (out)       stringlist with keyids
     1.7 -//      color (out)         color for the message
     1.8 +//      rating (out)        rating for the message
     1.9  //      flags (out)         flags to signal special decryption features
    1.10  //
    1.11  //  return value:
     2.1 --- a/src/mime.c	Mon Oct 03 22:22:36 2016 +0200
     2.2 +++ b/src/mime.c	Mon Oct 03 22:26:48 2016 +0200
     2.3 @@ -581,7 +581,7 @@
     2.4      plaintext = (msg->longmsg) ? msg->longmsg : "";
     2.5      htmltext = msg->longmsg_formatted;
     2.6  
     2.7 -    if (htmltext) {
     2.8 +    if (htmltext && (htmltext[0] != '\0')) {
     2.9          status = mime_html_text(plaintext, htmltext, &mime);
    2.10          if (status != PEP_STATUS_OK)
    2.11              goto pep_error;