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

Ensured that inserConnect() is only called when the widget is visible

Browse source 
- added new method RsautoUpdatePage::securedUpdatePage()
- made insertConnect() private to disallow connecting it with callbacks in notifyQt.cpp
- this should also correct some possible deadlocks in passphrase handling
Needs full recompile + qmake of GUI



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-21 12:55:03 +00:00
parent 469b37aa60
commit bb916ad1cc
5 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -184,7 +184,7 @@ void NetworkDialog::changeEvent(QEvent *e)
QWidget::changeEvent(e);
switch (e->type()) {
case QEvent::StyleChange:
insertConnect();
securedUpdateDisplay();
break;
default:
// remove compiler warnings
@ -192,13 +192,6 @@ void NetworkDialog::changeEvent(QEvent *e)
}
}
//void NetworkDialog::updateNewDiscoveryInfo()
//{
// //std::cerr << "Received new p3disc info. Updating networkview." << std::endl;
// //networkview->update();
// //networkview->updateDisplay();
//}
void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ )
{
//std::cerr << "NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl;
@ -263,7 +256,7 @@ void NetworkDialog::denyFriend()
std::string peer_id = wi->text(COLUMN_PEERID).toStdString() ;
rsPeers->removeFriend(peer_id) ;
insertConnect() ;
securedUpdateDisplay();
}
void NetworkDialog::deleteCert()
{
@ -276,7 +269,7 @@ void NetworkDialog::deleteCert()
std::string peer_id = wi->text(9).toStdString() ;
rsPeers->deleteCertificate(peer_id) ;
insertConnect() ;
securedUpdateDisplay();
#endif
}