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

suppressed notify callback in main thread, resulting in deadlock, and explicitely askes for queued message passing for notifyError

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2666 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-29 19:08:53 +00:00
parent 498d0d1994
commit 37124b0f9c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/pqi/authgpg.cc
View File

@ -351,9 +351,9 @@ bool AuthGPG::storeAllKeys_locked()
if (GPG_ERR_NO_ERROR != gpgme_op_keylist_start (CTX, "", 0)) if (GPG_ERR_NO_ERROR != gpgme_op_keylist_start (CTX, "", 0))
{ {
std::cerr << "AuthGPG::storeAllKeys_locked() Error iterating through KeyList" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() Error iterating through KeyList" << std::endl;
if (rsicontrol != NULL) { // if (rsicontrol != NULL) {
rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot acess key list."); // rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot acess key list.");
} // }
gpgme_set_keylist_mode(CTX, origmode); gpgme_set_keylist_mode(CTX, origmode);
return false; return false;
} }
@ -362,9 +362,9 @@ bool AuthGPG::storeAllKeys_locked()
ERR = gpgme_op_keylist_next (CTX, &KEY); ERR = gpgme_op_keylist_next (CTX, &KEY);
if (GPG_ERR_NO_ERROR != ERR) { if (GPG_ERR_NO_ERROR != ERR) {
std::cerr << "AuthGPG::storeAllKeys_locked() didn't find any gpg key in the keyring" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() didn't find any gpg key in the keyring" << std::endl;
if (rsicontrol != NULL) { // if (rsicontrol != NULL) {
rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list."); // rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list.");
} // }
return false; return false;
} else { } else {
//let's start a new list //let's start a new list

2
retroshare-gui/src/main.cpp
View File

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ; QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ;
QObject::connect(w->peersDialog,SIGNAL(friendsUpdated()),w->networkDialog,SLOT(insertConnect())) ; QObject::connect(w->peersDialog,SIGNAL(friendsUpdated()),w->networkDialog,SLOT(insertConnect())) ;
QObject::connect(w->peersDialog,SIGNAL(notifyGroupChat(const QString&,const QString&)),w,SLOT(displaySystrayMsg(const QString&,const QString&))) ; QObject::connect(w->peersDialog,SIGNAL(notifyGroupChat(const QString&,const QString&)),w,SLOT(displaySystrayMsg(const QString&,const QString&)),Qt::QueuedConnection) ;
/* only show window, if not startMinimized */ /* only show window, if not startMinimized */
RshareSettings *_settings = new RshareSettings(); RshareSettings *_settings = new RshareSettings();