merge ENGINE-639 sync
authorDirk Zimmermann <dz@pep.security>
Fri, 27 Sep 2019 13:35:06 +0200
branchsync
changeset 409451464b487900
parent 4091 5d1a6414271f
parent 4093 30ed48409334
child 4096 ef291fbfa5c6
merge ENGINE-639
     1.1 --- a/src/baseprotocol.c	Thu Sep 26 15:15:15 2019 +0200
     1.2 +++ b/src/baseprotocol.c	Fri Sep 27 13:35:06 2019 +0200
     1.3 @@ -81,7 +81,7 @@
     1.4          goto enomem;
     1.5  
     1.6      add_opt_field(msg, "pEp-auto-consume", "yes");
     1.7 -    add_opt_field(msg, "in-reply-to", "pEp-auto-consume@pEp.foundation");
     1.8 +    msg->in_reply_to = stringlist_add(msg->in_reply_to, "pEp-auto-consume@pEp.foundation");
     1.9  
    1.10      msg->from = identity_dup(me);
    1.11      if (!msg->from)
     2.1 --- a/sync/gen_statemachine.ysl2	Thu Sep 26 15:15:15 2019 +0200
     2.2 +++ b/sync/gen_statemachine.ysl2	Fri Sep 27 13:35:06 2019 +0200
     2.3 @@ -554,7 +554,7 @@
     2.4                                  goto the_end;
     2.5                              }
     2.6                              add_opt_field(m, "pEp-auto-consume", "yes");
     2.7 -                            add_opt_field(m, "in-reply-to", "pEp-auto-consume@pEp.foundation");
     2.8 +                            m->in_reply_to = stringlist_add(m->in_reply_to, "pEp-auto-consume@pEp.foundation");
     2.9                              free_message(_m);
    2.10                              break;
    2.11  
    2.12 @@ -733,7 +733,7 @@
    2.13                                  goto the_end;
    2.14                              }
    2.15                              add_opt_field(m, "pEp-auto-consume", "yes");
    2.16 -                            add_opt_field(m, "in-reply-to", "pEp-auto-consume@pEp.foundation");
    2.17 +                            m->in_reply_to = stringlist_add(m->in_reply_to, "pEp-auto-consume@pEp.foundation");
    2.18                              free_message(_m);
    2.19                              break;
    2.20  
    2.21 @@ -758,7 +758,7 @@
    2.22                                  goto the_end;
    2.23                              }
    2.24                              add_opt_field(m, "pEp-auto-consume", "yes");
    2.25 -                            add_opt_field(m, "in-reply-to", "pEp-auto-consume@pEp.foundation");
    2.26 +                            m->in_reply_to = stringlist_add(m->in_reply_to, "pEp-auto-consume@pEp.foundation");
    2.27                              free_message(_m);
    2.28                      }
    2.29