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

- ported commit from v0.4.x to integrate new RsAvatarItem code

Browse source 
- suppressed compatibility with old avatar transmition code
- added code for storing and sending a custom status string (for e.g. saying "I'm not here now") in p3ChatService
- added code for sending group chat status messages "peer is typing". Not fully functionnal yet.

Warnings: 
- this commit breaks the compatibility for avatar transmission
- the new avatar transmission is not fully working yet




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-09-29 20:37:20 +00:00
parent dfee01d4d4
commit 396058c665
15 changed files with 388 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/rsserver/p3msgs.cc
View file

@ -109,6 +109,10 @@ bool p3Msgs::ChatSend(ChatInfo &ci)
return true;
}
void p3Msgs::sendGroupChatStatusString(const std::string& status_string)
{
mChatSrv->sendGroupChatStatusString(status_string);
}
void p3Msgs::sendStatusString(const std::string& peer_id,const std::string& status_string)
{
mChatSrv->sendStatusString(peer_id,status_string);
@ -188,4 +192,12 @@ void p3Msgs::getAvatarData(std::string pid,unsigned char *& data,int& size)
mChatSrv->getAvatarJpegData(pid,data,size) ;
}
std::string p3Msgs::getCustomStateString()
{
return mChatSrv->getCustomStateString() ;
}
void p3Msgs::setCustomStateString(const std::string& state_string)
{
mChatSrv->setCustomStateString(state_string) ;
}

6
libretroshare/src/rsserver/p3msgs.h
View file

@ -57,12 +57,18 @@ class p3Msgs: public RsMsgs
virtual void setOwnAvatarData(const unsigned char *data,int size);
virtual void getOwnAvatarData(unsigned char *& data,int& size);
// gets/set avatar from peer id in jpeg format.
virtual void setCustomStateString(const std::string& status_string) ;
virtual std::string getCustomStateString() ;
/****************************************/
/* Chat */
virtual bool chatAvailable();
virtual bool ChatSend(ChatInfo &ci);
virtual bool getNewChat(std::list<ChatInfo> &chats);
virtual void sendStatusString(const std::string& peer_id,const std::string& status_string) ;
virtual void sendGroupChatStatusString(const std::string& status_string) ;
/****************************************/