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

Merge pull request #447 from PhenomRetroShare/Fix_IdChooserInSignedLobby

Browse Source 
Fix IdChooser in Signed Lobby.
This commit is contained in:
Cyril Soler 2016-07-30 21:15:08 +02:00 committed by GitHub
commit 372105570b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -135,8 +135,15 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
RsGxsId current_id; RsGxsId current_id;
rsMsgs->getIdentityForChatLobby(lobbyId, current_id); rsMsgs->getIdentityForChatLobby(lobbyId, current_id);
uint32_t idChooserFlag = IDCHOOSER_ID_REQUIRED;
ChatLobbyInfo lobbyInfo ;
if(rsMsgs->getChatLobbyInfo(lobbyId,lobbyInfo)) {
if (lobbyInfo.lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) {
idChooserFlag |= IDCHOOSER_NON_ANONYMOUS;
}
}
ownIdChooser = new GxsIdChooser() ; ownIdChooser = new GxsIdChooser() ;
ownIdChooser->loadIds(IDCHOOSER_ID_REQUIRED,current_id) ; ownIdChooser->loadIds(idChooserFlag, current_id) ;
QWidgetAction *checkableAction = new QWidgetAction(this); QWidgetAction *checkableAction = new QWidgetAction(this);
checkableAction->setDefaultWidget(ownIdChooser); checkableAction->setDefaultWidget(ownIdChooser);
@ -281,8 +288,6 @@ void ChatLobbyDialog::init()
QString title; QString title;
std::list<ChatLobbyInfo>::const_iterator lobbyIt;
if(rsMsgs->getChatLobbyInfo(lobbyId,linfo)) if(rsMsgs->getChatLobbyInfo(lobbyId,linfo))
{ {
title = QString::fromUtf8(linfo.lobby_name.c_str()); title = QString::fromUtf8(linfo.lobby_name.c_str());