From 37124b0f9cffc201d905c200c82332d03cdf4344 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 29 Mar 2010 19:08:53 +0000 Subject: [PATCH] suppressed notify callback in main thread, resulting in deadlock, and explicitely askes for queued message passing for notifyError git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2666 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authgpg.cc | 12 ++++++------ retroshare-gui/src/main.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index a4407c59e..d7103d775 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -351,9 +351,9 @@ bool AuthGPG::storeAllKeys_locked() if (GPG_ERR_NO_ERROR != gpgme_op_keylist_start (CTX, "", 0)) { std::cerr << "AuthGPG::storeAllKeys_locked() Error iterating through KeyList" << std::endl; - if (rsicontrol != NULL) { - rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot acess key list."); - } +// if (rsicontrol != NULL) { +// rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot acess key list."); +// } gpgme_set_keylist_mode(CTX, origmode); return false; } @@ -362,9 +362,9 @@ bool AuthGPG::storeAllKeys_locked() ERR = gpgme_op_keylist_next (CTX, &KEY); if (GPG_ERR_NO_ERROR != ERR) { std::cerr << "AuthGPG::storeAllKeys_locked() didn't find any gpg key in the keyring" << std::endl; - if (rsicontrol != NULL) { - rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list."); - } +// if (rsicontrol != NULL) { +// rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list."); +// } return false; } else { //let's start a new list diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 9a6019f67..6e52ea129 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) 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(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 */ RshareSettings *_settings = new RshareSettings();