merged in default via ENGINE-214 ENGINE-275
authorKrista Bennett <krista@pep-project.org>
Fri, 13 Oct 2017 13:23:41 +0200
branchENGINE-275
changeset 2159b417e92107ab
parent 2157 bb39881db930
parent 2158 c96ee66f4fc8
child 2160 5f5fe1d047ee
child 2721 f9f8590b8aa4
merged in default via ENGINE-214
src/message_api.c
src/mime.c
     1.1 --- a/src/mime.c	Fri Oct 13 13:14:33 2017 +0200
     1.2 +++ b/src/mime.c	Fri Oct 13 13:23:41 2017 +0200
     1.3 @@ -819,14 +819,12 @@
     1.4  	struct mailmime_parameter * param;
     1.5      int r;
     1.6      PEP_STATUS status;
     1.7 -    //char *subject;
     1.8      char *plaintext;
     1.9      size_t plaintext_size;
    1.10  
    1.11      assert(msg->attachments && msg->attachments->next &&
    1.12              msg->attachments->next->value);
    1.13  
    1.14 -    //subject = (msg->shortmsg) ? msg->shortmsg : "pEp"; // not used, yet.
    1.15      plaintext = msg->attachments->next->value;
    1.16      plaintext_size = msg->attachments->next->size;
    1.17