From c9a8c0e4ec71696d5eb34e342d4fd11b103d86da Mon Sep 17 00:00:00 2001 From: drbob Date: Sun, 24 Mar 2013 16:32:20 +0000 Subject: [PATCH] fixed up function signature for subscribeToGroup() was missing token reference. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6278 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/retroshare/rsgxschannels.h | 2 +- libretroshare/src/services/p3gxschannels.cc | 6 ++++-- libretroshare/src/services/p3gxschannels.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/retroshare/rsgxschannels.h b/libretroshare/src/retroshare/rsgxschannels.h index 1c8a77341..902b7c5bd 100644 --- a/libretroshare/src/retroshare/rsgxschannels.h +++ b/libretroshare/src/retroshare/rsgxschannels.h @@ -104,7 +104,7 @@ virtual bool getChannelAutoDownload(const RsGxsGroupId &groupid) = 0; //virtual bool groupShareKeys(const std::string &groupId, std::list& peers); // Overloaded subscribe fn. -virtual void subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId, bool subscribe) = 0; +virtual bool subscribeToGroup(uint32_t &token, const RsGxsGroupId &groupId, bool subscribe) = 0; virtual bool createGroup(uint32_t &token, RsGxsChannelGroup &group) = 0; virtual bool createPost(uint32_t &token, RsGxsChannelPost &post) = 0; diff --git a/libretroshare/src/services/p3gxschannels.cc b/libretroshare/src/services/p3gxschannels.cc index 578d55b32..2e4231664 100644 --- a/libretroshare/src/services/p3gxschannels.cc +++ b/libretroshare/src/services/p3gxschannels.cc @@ -442,7 +442,7 @@ void p3GxsChannels::clearUnsubscribedGroup(const RsGxsGroupId &id) } -void p3GxsChannels::subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId, bool subscribe) +bool p3GxsChannels::subscribeToGroup(uint32_t &token, const RsGxsGroupId &groupId, bool subscribe) { std::cerr << "p3GxsChannels::subscribedToGroup() id: " << groupId << " subscribe: " << subscribe; std::cerr << std::endl; @@ -451,10 +451,12 @@ void p3GxsChannels::subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId groups.push_back(groupId); // Call down to do the real work. - RsGenExchange::subscribeToGroup(token, groupId, subscribe); + bool response = RsGenExchange::subscribeToGroup(token, groupId, subscribe); // reload Group afterwards. request_SpecificSubscribedGroups(groups); + + return response; } diff --git a/libretroshare/src/services/p3gxschannels.h b/libretroshare/src/services/p3gxschannels.h index 3fd669265..e06ca3406 100644 --- a/libretroshare/src/services/p3gxschannels.h +++ b/libretroshare/src/services/p3gxschannels.h @@ -134,7 +134,7 @@ virtual bool acknowledgeVote(const uint32_t& token, std::pair