Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 01:24:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed compilation, added missing methods for new distant chat

Browse source
This commit is contained in:
csoler 2015-11-28 14:55:56 -05:00
parent 6ca49a2d98
commit a29f15ae32
13 changed files with 124 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/chat/ChatDialog.cpp
View file

@ -93,6 +93,7 @@ void ChatDialog::init(ChatId id, const QString &title)
/* see if it already exists */
ChatDialog *cd = getExistingChat(id);
DistantChatPeerInfo pinfo ;
if (cd == NULL) {
@ -104,11 +105,15 @@ void ChatDialog::init(ChatId id, const QString &title)
ChatLobbyDialog* cld = new ChatLobbyDialog(id.toLobbyId());
cld->init();
cd = cld;
} else if(id.isGxsTunnelId()) {
PopupDistantChatDialog* pdcd = new PopupDistantChatDialog(id.toGxsTunnelId());
pdcd->init() ;
}
else if(id.isPeerId() && rsMsgs->getDistantChatStatus(id.toPeerId(),pinfo))
{
PopupDistantChatDialog* pdcd = new PopupDistantChatDialog(id.toPeerId());
pdcd->init(pinfo.peer_id, QString("This is a distant chat")) ;
cd = pdcd;
} else {
}
else
{
RsPeerDetails sslDetails;
if (rsPeers->getPeerDetails(id.toPeerId(), sslDetails)) {
PopupChatDialog* pcd = new PopupChatDialog();