Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed up subscribe Macros and fn for channels.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6276 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-03-24 15:56:21 +00:00
parent 84fe53b611
commit 42c6a9282a
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/retroshare/rsgxschannels.h
View File

@ -103,6 +103,9 @@ virtual bool getChannelAutoDownload(const RsGxsGroupId &groupid) = 0;
//virtual bool groupRestoreKeys(const std::string &groupId); //virtual bool groupRestoreKeys(const std::string &groupId);
//virtual bool groupShareKeys(const std::string &groupId, std::list<std::string>& peers); //virtual bool groupShareKeys(const std::string &groupId, std::list<std::string>& peers);
// Overloaded subscribe fn.
virtual void subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId, bool subscribe) = 0;
virtual bool createGroup(uint32_t &token, RsGxsChannelGroup &group) = 0; virtual bool createGroup(uint32_t &token, RsGxsChannelGroup &group) = 0;
virtual bool createPost(uint32_t &token, RsGxsChannelPost &post) = 0; virtual bool createPost(uint32_t &token, RsGxsChannelPost &post) = 0;

3
libretroshare/src/retroshare/rsgxsflags.h
View File

@ -117,10 +117,9 @@ namespace GXS_SERV {
#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_UNREAD) #define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_UNREAD)
#define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) #define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)
#define IS_GROUP_PUBLISHER(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH) #define IS_GROUP_PUBLISHER(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH)
#define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & (GXS_SERV::GROUP_SUBSCRIBE_ADMIN | GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) #define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
#define IS_GROUP_NOT_SUBSCRIBED(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_NOT_SUBSCRIBED) #define IS_GROUP_NOT_SUBSCRIBED(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_NOT_SUBSCRIBED)
#define IS_MSG_UNPROCESSED(status) (status & GXS_SERV::GXS_MSG_STATUS_UNPROCESSED) #define IS_MSG_UNPROCESSED(status) (status & GXS_SERV::GXS_MSG_STATUS_UNPROCESSED)

3
libretroshare/src/services/p3gxschannels.cc
View File

@ -442,7 +442,7 @@ void p3GxsChannels::clearUnsubscribedGroup(const RsGxsGroupId &id)
} }
void p3GxsChannels::subscribeToGroup(const RsGxsGroupId &groupId, bool subscribe) void p3GxsChannels::subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId, bool subscribe)
{ {
std::cerr << "p3GxsChannels::subscribedToGroup() id: " << groupId << " subscribe: " << subscribe; std::cerr << "p3GxsChannels::subscribedToGroup() id: " << groupId << " subscribe: " << subscribe;
std::cerr << std::endl; std::cerr << std::endl;
@ -451,7 +451,6 @@ void p3GxsChannels::subscribeToGroup(const RsGxsGroupId &groupId, bool subscribe
groups.push_back(groupId); groups.push_back(groupId);
// Call down to do the real work. // Call down to do the real work.
uint32_t token;
RsGenExchange::subscribeToGroup(token, groupId, subscribe); RsGenExchange::subscribeToGroup(token, groupId, subscribe);
// reload Group afterwards. // reload Group afterwards.

2
libretroshare/src/services/p3gxschannels.h
View File

@ -134,7 +134,7 @@ virtual bool acknowledgeVote(const uint32_t& token, std::pair<RsGxsGroupId, RsGx
// Overloaded from RsGxsIface. // Overloaded from RsGxsIface.
virtual void subscribeToGroup(const RsGxsGroupId &groupId, bool subscribe); virtual void subscribeToGroup(uint32_t token, const RsGxsGroupId &groupId, bool subscribe);
// Set Statuses. // Set Statuses.
virtual void setMessageProcessedStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool processed); virtual void setMessageProcessedStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool processed);