mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-09 17:45:15 -04:00
change back the engine setting. Now it should work with gpg1 and gpg2
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c1df0e1c1d
commit
c00928a349
7 changed files with 105 additions and 22 deletions
|
@ -83,8 +83,16 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
|
|||
ui.loadPasswd->hide();
|
||||
ui.label_4->hide();
|
||||
|
||||
ui.loadGPGPasswd->hide();
|
||||
ui.label_5->hide();
|
||||
std::string gpgEngineFileName;
|
||||
if (RsInit::getPGPEngineFileName(gpgEngineFileName)) {
|
||||
std::cerr << "RsInit::getPGPEngineFileName() : " << gpgEngineFileName << std::endl;
|
||||
//if fileName contains gpg2 then the passphrase is set by pinentry and not by RS
|
||||
QString *fileName = new QString(gpgEngineFileName.c_str());
|
||||
if (fileName->contains("gpg2")) {
|
||||
ui.loadGPGPasswd->hide();
|
||||
ui.label_5->hide();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* get all available pgp private certificates....
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue