Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 20:04:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed bug with default chat lobby identity causing settings to show an empty list. Also fixed up GxsIdChooser

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-26 21:20:57 +00:00
parent 24c421c0b7
commit 9d2b6faf9c
6 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
View file

@ -306,9 +306,10 @@ void GxsIdChooser::indexActivated(int index)
}
}
void GxsIdChooser::updateDisplay(bool complete)
void GxsIdChooser::updateDisplay(bool reset)
{
Q_UNUSED(complete)
if(reset)
mFirstLoad = true ;
/* Update identity list */
loadPrivateIds();

2
retroshare-gui/src/gui/gxs/GxsIdChooser.h
View file

@ -58,7 +58,7 @@ public:
protected:
virtual void showEvent(QShowEvent *event);
void updateDisplay(bool complete);
void updateDisplay(bool reset);
private slots:
void fillDisplay(bool complete);

6
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -272,8 +272,10 @@ ChatPage::load()
RsGxsId gxs_id ;
rsMsgs->getDefaultIdentityForChatLobby(gxs_id) ;
ui.chatLobbyIdentity_IC->loadIds(IDCHOOSER_ID_REQUIRED, gxs_id);
ui.chatLobbyIdentity_IC->setChosenId(gxs_id);
ui.chatLobbyIdentity_IC->setFlags(IDCHOOSER_ID_REQUIRED) ;
if(!gxs_id.isNull())
ui.chatLobbyIdentity_IC->setChosenId(gxs_id);
uint chatflags = Settings->getChatFlags();