ENGINE-504, maybe sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Wed, 07 Aug 2019 16:04:40 +0200
branchsync
changeset 396360b100beecb3
parent 3961 0eb8fc56d6fb
child 3964 5bf62752336f
ENGINE-504, maybe
src/message_api.c
src/pEp_internal.h
sync/gen_statemachine.ysl2
     1.1 --- a/src/message_api.c	Wed Aug 07 14:08:11 2019 +0200
     1.2 +++ b/src/message_api.c	Wed Aug 07 16:04:40 2019 +0200
     1.3 @@ -185,7 +185,7 @@
     1.4      }
     1.5  }
     1.6  
     1.7 -static void decorate_message(
     1.8 +void decorate_message(
     1.9      message *msg,
    1.10      PEP_rating rating,
    1.11      stringlist_t *keylist,
     2.1 --- a/src/pEp_internal.h	Wed Aug 07 14:08:11 2019 +0200
     2.2 +++ b/src/pEp_internal.h	Wed Aug 07 16:04:40 2019 +0200
     2.3 @@ -288,6 +288,13 @@
     2.4          size_t psize, char **ctext, size_t *csize
     2.5  );
     2.6  
     2.7 +void decorate_message(
     2.8 +    message *msg,
     2.9 +    PEP_rating rating,
    2.10 +    stringlist_t *keylist,
    2.11 +    bool add_version,
    2.12 +    bool clobber);
    2.13 +
    2.14  #if defined(NDEBUG) || defined(NOLOG)
    2.15  #define DEBUG_LOG(TITLE, ENTITY, DESC)
    2.16  #else
    2.17 @@ -556,4 +563,3 @@
    2.18      } while (rc == SQLITE_BUSY || rc == SQLITE_LOCKED);
    2.19      return rc;
    2.20  }
    2.21 -
     3.1 --- a/sync/gen_statemachine.ysl2	Wed Aug 07 14:08:11 2019 +0200
     3.2 +++ b/sync/gen_statemachine.ysl2	Wed Aug 07 16:04:40 2019 +0200
     3.3 @@ -515,6 +515,7 @@
     3.4                                  goto the_end;
     3.5                              }
     3.6                              attach_own_key(session, _m);
     3.7 +                            decorate_message(_m, PEP_rating_undefined, NULL, true, true);
     3.8                              m = _m;
     3.9                              break;
    3.10