Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 14:52:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change back the engine setting. Now it should work with gpg1 and gpg2

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-27 20:50:30 +00:00
parent c1df0e1c1d
commit c00928a349
7 changed files with 105 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -51,9 +51,17 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
//ui.genName->setFocus(Qt::OtherFocusReason);
#ifndef WINDOWS_SYS /* UNIX */
//comment those to show the pgp password field
ui.genPGPpassword->hide();
ui.label_3->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.genPGPpassword->hide();
ui.label_3->hide();
}
}
//comment those to show the pgp password field
#endif
#ifdef RS_USE_PGPSSL

12
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -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....

1
retroshare-gui/src/rsiface/rsinit.h
View file

@ -47,6 +47,7 @@ class RsInit
/* Account Details (Combined GPG+SSL Setup) */
static bool getPreferedAccountId(std::string &id);
static bool getPGPEngineFileName(std::string &fileName);
static bool getAccountIds(std::list<std::string> &ids);
static bool getAccountDetails(std::string id,
std::string &gpgId, std::string &gpgName,