oops. double heads! I can merge them without conflicts.
authorRoker <roker@pep-project.org>
Wed, 29 Jul 2020 00:52:10 +0200
changeset 102756414b64b06e
parent 1026 b0aede2f1bc5
parent 1025 65bd786c02c9
child 1029 8918f1baa6e5
oops. double heads! I can merge them without conflicts.
     1.1 --- a/server/ev_server.cc	Wed Jul 29 00:50:40 2020 +0200
     1.2 +++ b/server/ev_server.cc	Wed Jul 29 00:52:10 2020 +0200
     1.3 @@ -70,6 +70,7 @@
     1.4  		// from message_api.h
     1.5  		FP( "Message API", new Separator ),
     1.6  		FP( "encrypt_message", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message*>, In<stringlist_t*>, Out<message*>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &encrypt_message ) ),
     1.7 +		FP( "cache_encrypt_message", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message*>, In<stringlist_t*>, Out<message*>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &pEp::MessageCache::cache_encrypt_message ) ),
     1.8  		FP( "encrypt_message_and_add_priv_key", new FuncPC<PEP_STATUS, In_Pep_Session,
     1.9  			In<message*>, Out<message*>, In<c_string>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &encrypt_message_and_add_priv_key) ),
    1.10  		FP( "encrypt_message_for_self", new FuncPC<PEP_STATUS, In_Pep_Session,
    1.11 @@ -85,6 +86,7 @@
    1.12  		FP( "cache_mime_encode_message", new Func<PEP_STATUS, In<int>, In<const message*>, In<bool>, Out<char*>, In<bool, ParamFlag::NoInput>>( &pEp::MessageCache::cache_mime_encode_message)),
    1.13          FP( "cache_release", new Func<PEP_STATUS, In<c_string>>( &pEp::MessageCache::cache_release )),
    1.14  		FP( "mime_decode_message", new Func<PEP_STATUS, In<c_string>, InLength<>, Out<message*>, In<bool*, ParamFlag::NoInput>>( &mime_decode_message )),
    1.15 +		FP( "cache_mime_decode_message", new Func<PEP_STATUS, In<c_string>, InLength<>, Out<message*>, In<bool*, ParamFlag::NoInput>>( &pEp::MessageCache::cache_mime_decode_message )),
    1.16  		
    1.17  		// from pEpEngine.h
    1.18  		FP( "pEp Engine Core API", new Separator),