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

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -328,7 +328,7 @@ void ChatLobbyWidget::updateDisplay()
// now, do a nice display of lobbies
std::string vpid;
RsPeerId vpid;
std::list<ChatLobbyInfo>::const_iterator lobbyIt;
// remove not existing public lobbies
@ -548,7 +548,7 @@ void ChatLobbyWidget::createChatLobby()
privacyLevel = action->data().toInt();
}
std::list<std::string> friends;
std::list<RsPeerId> friends;
CreateLobbyDialog(friends, privacyLevel).exec();
}
@ -575,7 +575,7 @@ static void subscribeLobby(QTreeWidgetItem *item)
ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong();
if (rsMsgs->joinVisibleChatLobby(id)) {
std::string vpeer_id;
RsPeerId vpeer_id;
if (rsMsgs->getVirtualPeerId(id, vpeer_id)) {
ChatDialog::chatFriend(vpeer_id,true) ;
}
@ -739,7 +739,7 @@ void ChatLobbyWidget::unsubscribeChatLobby(ChatLobbyId id)
}
// Unsubscribe the chat lobby
std::string vpeer_id;
RsPeerId vpeer_id;
if (rsMsgs->getVirtualPeerId(id, vpeer_id))
ChatDialog::closeChat(vpeer_id);
@ -812,7 +812,7 @@ void ChatLobbyWidget::itemDoubleClicked(QTreeWidgetItem *item, int /*column*/)
void ChatLobbyWidget::displayChatLobbyEvent(qulonglong lobby_id, int event_type, const QString& nickname, const QString& str)
{
std::string vpid;
RsPeerId vpid;
if (rsMsgs->getVirtualPeerId(lobby_id, vpid)) {
if (ChatLobbyDialog *cld = dynamic_cast<ChatLobbyDialog*>(ChatDialog::getExistingChat(vpid))) {
cld->displayLobbyEvent(event_type, nickname, str);
@ -831,7 +831,7 @@ void ChatLobbyWidget::readChatLobbyInvites()
rsMsgs->acceptLobbyInvite((*it).lobby_id);
std::string vpid;
RsPeerId vpid;
if(rsMsgs->getVirtualPeerId((*it).lobby_id,vpid )) {
ChatDialog::chatFriend(vpid,true);
} else {