merge
authorEdouard Tisserant
Thu, 09 Jun 2016 18:50:59 +0200
changeset 7263316d3bad10f
parent 725 188c7813590a
parent 724 dc030fe6ed20
child 731 6f7c688e0fd4
merge
src/pgp_gpg.c
     1.1 --- a/src/map_asn1.h	Thu Jun 09 18:44:35 2016 +0200
     1.2 +++ b/src/map_asn1.h	Thu Jun 09 18:50:59 2016 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -#pragma one
     1.5 +#pragma once
     1.6  
     1.7  #include "pEpEngine.h"
     1.8  #include "stringlist.h"
     2.1 --- a/src/mime.c	Thu Jun 09 18:44:35 2016 +0200
     2.2 +++ b/src/mime.c	Thu Jun 09 18:50:59 2016 +0200
     2.3 @@ -646,14 +646,14 @@
     2.4      struct mailmime * submime = NULL;
     2.5      int r;
     2.6      PEP_STATUS status;
     2.7 -    char *subject;
     2.8 +    //char *subject;
     2.9      char *plaintext;
    2.10      char *htmltext;
    2.11  
    2.12      assert(msg);
    2.13      assert(result);
    2.14  
    2.15 -    subject = (msg->shortmsg) ? msg->shortmsg : "pEp";
    2.16 +    //subject = (msg->shortmsg) ? msg->shortmsg : "pEp";  // not used, yet.
    2.17      plaintext = (msg->longmsg) ? msg->longmsg : "";
    2.18      htmltext = msg->longmsg_formatted;
    2.19  
    2.20 @@ -739,13 +739,13 @@
    2.21  	struct mailmime_parameter * param;
    2.22      int r;
    2.23      PEP_STATUS status;
    2.24 -    char *subject;
    2.25 +    //char *subject;
    2.26      char *plaintext;
    2.27  
    2.28      assert(msg->attachments && msg->attachments->next &&
    2.29              msg->attachments->next->value);
    2.30  
    2.31 -    subject = (msg->shortmsg) ? msg->shortmsg : "pEp";
    2.32 +    //subject = (msg->shortmsg) ? msg->shortmsg : "pEp"; // not used, yet.
    2.33      plaintext = msg->attachments->next->value;
    2.34  
    2.35      mime = part_multiple_new("multipart/encrypted");
     3.1 --- a/src/pEpEngine.c	Thu Jun 09 18:44:35 2016 +0200
     3.2 +++ b/src/pEpEngine.c	Thu Jun 09 18:50:59 2016 +0200
     3.3 @@ -1254,7 +1254,7 @@
     3.4  {
     3.5      if (text) {
     3.6          for (char *c = text; *c; c++) {
     3.7 -            if (*c < 32)
     3.8 +            if (*c < 32 && *c != '\n')
     3.9                  *c = 32;
    3.10              else if (*c == '"')
    3.11                  *c = '\'';
     4.1 --- a/src/pgp_gpg.c	Thu Jun 09 18:44:35 2016 +0200
     4.2 +++ b/src/pgp_gpg.c	Thu Jun 09 18:50:59 2016 +0200
     4.3 @@ -357,7 +357,7 @@
     4.4      gpgme_data_type_t dt;
     4.5  
     4.6      stringlist_t *_keylist = NULL;
     4.7 -    int i_key = 0;
     4.8 +    //int i_key = 0;
     4.9  
    4.10      assert(session);
    4.11      assert(ctext);
    4.12 @@ -1613,6 +1613,8 @@
    4.13      const char *reason_ref;
    4.14  } revoke_state;
    4.15  
    4.16 +
    4.17 +/*** unused?
    4.18  static bool isemptystring(const char *str)
    4.19  {
    4.20      if (str == NULL)
    4.21 @@ -1625,6 +1627,8 @@
    4.22  
    4.23      return true;
    4.24  }
    4.25 +***/
    4.26 +
    4.27  
    4.28  static gpgme_error_t revoke_fsm(
    4.29          void *_handle,
     5.1 --- a/sync/Makefile	Thu Jun 09 18:44:35 2016 +0200
     5.2 +++ b/sync/Makefile	Thu Jun 09 18:50:59 2016 +0200
     5.3 @@ -5,10 +5,10 @@
     5.4  skeleton: ../src/sync_actions.c.skeleton
     5.5  
     5.6  ../src/sync_actions.c.skeleton: sync.fsm gen_actions_skeleton.ysl2 fsm.yml2 functions.ysl2
     5.7 -	$(YML2PROC) -y gen_actions_skeleton.ysl2 $< -o $@
     5.8 +	$(YML2PROC) -I$(YML_PATH) -y gen_actions_skeleton.ysl2 $< -o $@
     5.9  
    5.10  ../src/sync_fsm.c: sync.fsm gen_statemachine.ysl2 fsm.yml2 functions.ysl2
    5.11 -	$(YML2PROC) -y gen_statemachine.ysl2 $< -o $@
    5.12 +	$(YML2PROC) -I$(YML_PATH) -y gen_statemachine.ysl2 $< -o $@
    5.13  
    5.14  .PHONY: clean
    5.15