From 8778ff379dc960df057b7fe20959996f9959498e Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Tue, 23 Aug 2016 18:57:27 +0200 Subject: [PATCH] fixing --- src/sync_mixin.cc | 9 +++++---- src/sync_mixin.hh | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/sync_mixin.cc b/src/sync_mixin.cc index 5eef01b..34916dc 100644 --- a/src/sync_mixin.cc +++ b/src/sync_mixin.cc @@ -7,7 +7,7 @@ namespace pEp { namespace PythonAdapter { - SyncMixIn::SyncMixIn() + SyncMixIn_callback::SyncMixIn_callback(PyObject *self) : _self(self) { PEP_STATUS status = register_sync_callbacks(session, (void *) this, _messageToSend, _showHandshake, inject_sync_msg, @@ -15,7 +15,8 @@ namespace pEp { assert(status == PEP_STATUS_OK); } - SyncMixIn::~SyncMixIn() { + SyncMixIn_callback::~SyncMixIn_callback() + { unregister_sync_callbacks(session); } @@ -92,12 +93,12 @@ namespace pEp { return (void *) 23; } - void SyncMixIn_callback::_messageToSend(Message msg) + void SyncMixIn_callback::messageToSend(Message msg) { call_method< void >(_self, "messageToSend", msg); } - void SyncMixIn_callback::_showHandshake(Identity me, Identity partner) + void SyncMixIn_callback::showHandshake(Identity me, Identity partner) { call_method< void >(_self, "showHandshake", me, partner); } diff --git a/src/sync_mixin.hh b/src/sync_mixin.hh index 6ad0add..c9e43c2 100644 --- a/src/sync_mixin.hh +++ b/src/sync_mixin.hh @@ -7,8 +7,8 @@ namespace pEp { namespace PythonAdapter { class SyncMixIn { public: - SyncMixIn(); - virtual ~SyncMixIn(); + SyncMixIn() { } + virtual ~SyncMixIn() { } virtual void messageToSend(Message msg) { throw runtime_error("override this method"); @@ -39,10 +39,11 @@ namespace pEp { PyObject* const _self; public: - SyncMixIn_callback(PyObject *self) : _self(self) { } + SyncMixIn_callback(PyObject *self); + ~SyncMixIn_callback(); - void _messageToSend(Message msg); - void _showHandshake(Identity me, Identity partner); + void messageToSend(Message msg); + void showHandshake(Identity me, Identity partner); }; } }