diff --git a/src/gxs/rsgenexchange.cc b/src/gxs/rsgenexchange.cc index a973bc1ef..ff54d48a1 100644 --- a/src/gxs/rsgenexchange.cc +++ b/src/gxs/rsgenexchange.cc @@ -1112,6 +1112,7 @@ static void addMessageChanged(std::map > void RsGenExchange::receiveChanges(std::vector& changes) { + std::cerr << "*********************************** RsGenExchange::receiveChanges()" << std::endl; #ifdef GEN_EXCH_DEBUG std::cerr << "RsGenExchange::receiveChanges()" << std::endl; #endif diff --git a/src/retroshare/rsidentity.h b/src/retroshare/rsidentity.h index 2874ccc91..d30e55978 100644 --- a/src/retroshare/rsidentity.h +++ b/src/retroshare/rsidentity.h @@ -309,6 +309,7 @@ enum class RsGxsIdentityEventCode: uint8_t UNKNOWN = 0x00, NEW_IDENTITY = 0x01, DELETED_IDENTITY = 0x02, + UPDATED_IDENTITY = 0x03, }; struct RsGxsIdentityEvent: public RsEvent diff --git a/src/services/p3postbase.cc b/src/services/p3postbase.cc index 309c3ee16..faaa1efb3 100644 --- a/src/services/p3postbase.cc +++ b/src/services/p3postbase.cc @@ -174,11 +174,6 @@ void p3PostBase::notifyChanges(std::vector &changes) delete *it; } - -#ifdef POSTBASE_DEBUG - std::cerr << "p3PostBase::notifyChanges() -> receiveChanges()"; - std::cerr << std::endl; -#endif } void p3PostBase::service_tick() @@ -615,7 +610,9 @@ void p3PostBase::background_loadMsgs(const uint32_t &token, bool unprocessed) #endif changes.push_back(msgChanges); - receiveHelperChanges(changes); + //receiveHelperChanges(changes); + + notifyChanges(changes); } else { @@ -768,7 +765,8 @@ void p3PostBase::background_updateVoteCounts(const uint32_t &token) #endif changes.push_back(msgChanges); - receiveHelperChanges(changes); + //receiveHelperChanges(changes); + notifyChanges(changes); } else { diff --git a/src/services/p3postbase.h b/src/services/p3postbase.h index 1e63b0dcd..8fc305b45 100644 --- a/src/services/p3postbase.h +++ b/src/services/p3postbase.h @@ -72,9 +72,6 @@ class p3PostBase: public RsGenExchange, public GxsTokenQueue, public RsTickEvent virtual void service_tick(); - // This should be overloaded to call RsGxsIfaceHelper::receiveChanges(). -virtual void receiveHelperChanges(std::vector& changes) = 0; - protected: virtual void notifyChanges(std::vector& changes); diff --git a/src/services/p3posted.h b/src/services/p3posted.h index 402f69298..494a6cf5d 100644 --- a/src/services/p3posted.h +++ b/src/services/p3posted.h @@ -53,11 +53,6 @@ virtual void notifyChanges(std::vector& changes) public: -virtual void receiveHelperChanges(std::vector& changes) -{ - return RsGxsIfaceHelper::receiveChanges(changes); -} - // Posted Specific DataTypes. virtual bool getGroupData(const uint32_t &token, std::vector &groups); virtual bool getPostData(const uint32_t &token, std::vector &posts, std::vector &cmts); diff --git a/src/services/p3wiki.cc b/src/services/p3wiki.cc index 26c33881a..1d770b5e5 100644 --- a/src/services/p3wiki.cc +++ b/src/services/p3wiki.cc @@ -102,8 +102,6 @@ void p3Wiki::notifyChanges(std::vector& changes) { std::cerr << "p3Wiki::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */ diff --git a/src/services/p3wire.cc b/src/services/p3wire.cc index 23d31198f..fda88f7a2 100644 --- a/src/services/p3wire.cc +++ b/src/services/p3wire.cc @@ -88,8 +88,6 @@ void p3Wire::notifyChanges(std::vector& changes) { std::cerr << "p3Wire::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */ diff --git a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc index e30309942..8d1799507 100644 --- a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc +++ b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc @@ -82,8 +82,6 @@ void GxsTestService::notifyChanges(std::vector& changes) { std::cerr << "GxsTestService::notifyChanges() New stuff"; std::cerr << std::endl; - - RsGxsIfaceHelper::receiveChanges(changes); } /* Specific Service Data */