Changing code so that it works with the new API

server/Makefile

@@ -21,7 +21,7 @@ LIBRARY_PATH?=/usr/local/lib
 CFLAGS+=-std=c14 -fvisibility=hidden
 CXXFLAGS+= -I$(PEP_INCLUDE) -std=c++14 -fvisibility=hidden
 LDFLAGS+=-std=c++14 -L$(PEP_LIB_PATH) -L$(LIBRARY_PATH)
-LDLIBS+= -lpEpEngine -lpEpAdapter -lpEpwebserver -lasn1 \
+LDLIBS+= -lpEpEngine -lpEpAdapter -lpEpwebserver \
 	 -lsequoia_openpgp_ffi -lhogweed -lnettle -lgmp \
 	 -lz -lsqlite3
 

server/ev_server.cc

@@ -112,7 +112,7 @@ const FunctionMap functions = {
 		FP( "cache_encrypt_message_for_self", new FuncPC<PEP_STATUS, In_Pep_Session,
 			In<pEp_identity*>, In<message*>, In<stringlist_t*>, Out<message*>, In<PEP_enc_format>, In<PEP_encrypt_flags_t>>( &pEp::MessageCache::cache_encrypt_message_for_self) ),
 
-		FP( "decrypt_message", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message*>, Out<message*>, InOutP<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>>(  &decrypt_message ) ),
+		FP( "decrypt_message", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message*>, InOutP<message*>, InOutP<stringlist_t*>, InOutP<PEP_decrypt_flags_t>>( &decrypt_message ) ),
 		FP( "cache_decrypt_message", new FuncPC<PEP_STATUS, In_Pep_Session, InOut<message*>, Out<message*>, InOutP<stringlist_t*>, Out<PEP_rating>, InOutP<PEP_decrypt_flags_t>>(  &pEp::MessageCache::cache_decrypt_message) ),
 		FP( "get_key_rating_for_user", new FuncPC<PEP_STATUS, In_Pep_Session, In<c_string>, In<c_string>, Out<PEP_rating>>( &get_key_rating_for_user) ),
 		
@@ -414,5 +414,5 @@ void ev_server::thread_init()
 void ev_server::thread_done()
 {
 	JsonAdapter::getInstance().connection_close_cb();
-	pEp::Adapter::session(pEp::Adapter::release);
+	pEp::Adapter::session.release();
 }

server/json-adapter.cc

@@ -5,6 +5,7 @@
 #include <thread>
 #include <cstdint>
 #include <vector>
+#include <memory>
 #include <pEp/webserver.hh>
 
 #include <string>

server/mini-adapter-impl.cc

@@ -11,13 +11,13 @@ namespace mini {
 
 void startSync()
 {
-    pEp::callback_dispatcher.start_sync();
+    pEp::Adapter::start_sync();
 }
 
 
 void stopSync()
 {
-	pEp::callback_dispatcher.stop_sync();
+	pEp::Adapter::stop_sync();
 }