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

block the notify callback of authgpg when the main windows is launched

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-04-08 19:08:41 +00:00
parent ffdd38ddd5
commit 9f8a032d93
3 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libretroshare/src/rsserver/rsinit.cc
View file

@ -830,25 +830,6 @@ bool RsInit::SelectGPGAccount(std::string id)
}
//bool RsInit::LoadGPGPassword(std::string inPGPpasswd)
//{
//
// bool ok = false;
// if (0 < AuthGPG::getAuthGPG() -> LoadGPGPassword(inPGPpasswd))
// {
// ok = true;
// std::cerr << "PGP LoadPwd Success!";
// std::cerr << std::endl;
// }
// else
// {
// std::cerr << "PGP LoadPwd Failed!";
// std::cerr << std::endl;
// }
// return ok;
//}
bool RsInit::GeneratePGPCertificate(std::string name, std::string email, std::string passwd, std::string &pgpId, std::string &errString) {
return AuthGPG::getAuthGPG()->GeneratePGPCertificate(name, email, passwd, pgpId, errString);
}
@ -1223,6 +1204,8 @@ int RsInit::LoadCertificates(bool autoLoginNT)
/* wipe password */
RsInitConfig::passwd = "";
create_configinit(RsInitConfig::basedir, RsInitConfig::preferedId);
//don't autorise the password callback again because it will lead to deadlock due to QT reentrance
AuthGPG::getAuthGPG()->setAutorisePasswordCallbackNotify(false);
return 1;
}