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

bug fixes

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ChatLobby@4710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-12-04 22:22:15 +00:00
parent 71a079b55f
commit 0086e182ec
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/services/p3chatservice.cc
View file

@ -230,12 +230,17 @@ bool p3ChatService::getVirtualPeerId(const ChatLobbyId& id,std::string& vpid)
{ {
RsStackMutex stack(mChatMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mChatMtx); /********** STACK LOCKED MTX ******/
std::cerr << "Was asked for virtual peer name of " << std::hex << id << std::dec<< std::endl;
std::map<ChatLobbyId,ChatLobbyEntry>::const_iterator it(_chat_lobbys.find(id)) ; std::map<ChatLobbyId,ChatLobbyEntry>::const_iterator it(_chat_lobbys.find(id)) ;
if(it == _chat_lobbys.end()) if(it == _chat_lobbys.end())
{
std::cerr << " not found!! " << std::endl;
return false ; return false ;
}
vpid = it->second.virtual_peer_id ; vpid = it->second.virtual_peer_id ;
std::cerr << " returning " << vpid << std::endl;
return true ; return true ;
} }

5
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View file

@ -39,7 +39,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list<std::string>& peer_list,QWi
ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible lobby name here")) ; ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible lobby name here")) ;
ui->nickName_LE->setPlaceholderText(tr("Your nickname")) ; ui->nickName_LE->setPlaceholderText(tr("Your nickname")) ;
connect( ui->shareButton, SIGNAL( clicked ( bool ) ), this, SLOT( shareKey( ) ) ); connect( ui->shareButton, SIGNAL( clicked ( bool ) ), this, SLOT( createLobby( ) ) );
connect( ui->cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancel( ) ) ); connect( ui->cancelButton, SIGNAL( clicked ( bool ) ), this, SLOT( cancel( ) ) );
connect( ui->lobbyName_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) ); connect( ui->lobbyName_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) );
connect( ui->nickName_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) ); connect( ui->nickName_LE, SIGNAL( textChanged ( QString ) ), this, SLOT( checkTextFields( ) ) );
@ -48,6 +48,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list<std::string>& peer_list,QWi
this, SLOT(togglePersonItem( QTreeWidgetItem *, int ) )); this, SLOT(togglePersonItem( QTreeWidgetItem *, int ) ));
setShareList(peer_list); setShareList(peer_list);
checkTextFields() ;
} }
@ -123,6 +124,7 @@ void CreateLobbyDialog::setShareList(const std::list<std::string>& friend_list)
std::list<std::string> peers; std::list<std::string> peers;
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
mShareList.clear() ;
rsPeers->getFriendList(peers); rsPeers->getFriendList(peers);
/* get a link to the table */ /* get a link to the table */
@ -155,6 +157,7 @@ void CreateLobbyDialog::setShareList(const std::list<std::string>& friend_list)
if(*it == *it2) if(*it == *it2)
{ {
item -> setCheckState(0, Qt::Checked); item -> setCheckState(0, Qt::Checked);
mShareList.push_back(*it) ;
break ; break ;
} }