Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

committing missing part of rev. 7928

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-02-08 21:06:36 +00:00
parent 140ef988a5
commit baccdd58df
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/chat/distantchat.cc
View File

@ -905,7 +905,7 @@ RsGxsId DistantChatService::gxsIdFromHash(const TurtleFileHash& hash)
return RsGxsId(hash.toByteArray()); return RsGxsId(hash.toByteArray());
} }
bool DistantChatService::getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status) bool DistantChatService::getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status, RsGxsId *from_gxs_id)
{ {
RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/
@ -914,10 +914,15 @@ bool DistantChatService::getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& st
if(it != _distant_chat_contacts.end()) if(it != _distant_chat_contacts.end())
{ {
status = it->second.status ; status = it->second.status ;
if(from_gxs_id != NULL)
*from_gxs_id = it->second.own_gxs_id ;
return true ; return true ;
} }
status = RS_DISTANT_CHAT_STATUS_UNKNOWN ; status = RS_DISTANT_CHAT_STATUS_UNKNOWN ;
return false ; return false ;
} }

2
libretroshare/src/chat/distantchat.h
View File

@ -52,7 +52,7 @@ public:
// //
bool initiateDistantChatConnexion(const RsGxsId& to_gxs_id,const RsGxsId &from_gxs_id, uint32_t &error_code) ; bool initiateDistantChatConnexion(const RsGxsId& to_gxs_id,const RsGxsId &from_gxs_id, uint32_t &error_code) ;
bool closeDistantChatConnexion(const RsGxsId& pid) ; bool closeDistantChatConnexion(const RsGxsId& pid) ;
virtual bool getDistantChatStatus(const RsGxsId &gxs_id,uint32_t &status) ; virtual bool getDistantChatStatus(const RsGxsId &gxs_id,uint32_t &status, RsGxsId *from_gxs_id=NULL) ;
// derived in p3ChatService // derived in p3ChatService
virtual void handleIncomingItem(RsItem *) = 0; virtual void handleIncomingItem(RsItem *) = 0;

4
libretroshare/src/retroshare/rsmsgs.h
View File

@ -272,6 +272,8 @@ public:
bool operator<(const ChatId& other) const; bool operator<(const ChatId& other) const;
bool isSameEndpoint(const ChatId& other) const; bool isSameEndpoint(const ChatId& other) const;
bool operator==(const ChatId& other) const { return isSameEndpoint(other) ; }
bool isNotSet() const; bool isNotSet() const;
bool isPeerId() const; bool isPeerId() const;
bool isGxsId() const; bool isGxsId() const;
@ -465,7 +467,7 @@ virtual ChatLobbyId createChatLobby(const std::string& lobby_name,const std::str
/****************************************/ /****************************************/
virtual bool initiateDistantChatConnexion(const RsGxsId& to_pid,const RsGxsId& from_pid,uint32_t& error_code) = 0; virtual bool initiateDistantChatConnexion(const RsGxsId& to_pid,const RsGxsId& from_pid,uint32_t& error_code) = 0;
virtual bool getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status) = 0; virtual bool getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status, RsGxsId *from_gxs_id = NULL) = 0;
virtual bool closeDistantChatConnexion(const RsGxsId& pid) = 0; virtual bool closeDistantChatConnexion(const RsGxsId& pid) = 0;
}; };

4
libretroshare/src/rsserver/p3msgs.cc
View File

@ -521,9 +521,9 @@ bool p3Msgs::initiateDistantChatConnexion(const RsGxsId& to_gxs_id,const RsGxsId
{ {
return mChatSrv->initiateDistantChatConnexion(to_gxs_id,from_gxs_id,error_code) ; return mChatSrv->initiateDistantChatConnexion(to_gxs_id,from_gxs_id,error_code) ;
} }
bool p3Msgs::getDistantChatStatus(const RsGxsId &gxs_id,uint32_t &status) bool p3Msgs::getDistantChatStatus(const RsGxsId &gxs_id,uint32_t &status,RsGxsId *from_gxs_id)
{ {
return mChatSrv->getDistantChatStatus(gxs_id,status) ; return mChatSrv->getDistantChatStatus(gxs_id,status,from_gxs_id) ;
} }
bool p3Msgs::closeDistantChatConnexion(const RsGxsId& pid) bool p3Msgs::closeDistantChatConnexion(const RsGxsId& pid)
{ {

2
libretroshare/src/rsserver/p3msgs.h
View File

@ -155,7 +155,7 @@ class p3Msgs: public RsMsgs
virtual ChatLobbyId createChatLobby(const std::string& lobby_name,const std::string& lobby_topic,const std::list<RsPeerId>& invited_friends,uint32_t privacy_type) ; virtual ChatLobbyId createChatLobby(const std::string& lobby_name,const std::string& lobby_topic,const std::list<RsPeerId>& invited_friends,uint32_t privacy_type) ;
virtual bool initiateDistantChatConnexion(const RsGxsId& to_gxs_id,const RsGxsId& from_gxs_id,uint32_t& error_code) ; virtual bool initiateDistantChatConnexion(const RsGxsId& to_gxs_id,const RsGxsId& from_gxs_id,uint32_t& error_code) ;
virtual bool getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status) ; virtual bool getDistantChatStatus(const RsGxsId& gxs_id,uint32_t& status, RsGxsId *from_gxs_id=NULL) ;
virtual bool closeDistantChatConnexion(const RsGxsId &pid) ; virtual bool closeDistantChatConnexion(const RsGxsId &pid) ;
private: private: