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

add error info when gpg password is wrong

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-09 19:10:42 +00:00
parent fba2a3afae
commit 9262feac1c
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/rsserver/p3peers.cc
View file

@ -1023,9 +1023,9 @@ bool p3Peers::signGPGCertificate(std::string id)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
AuthGPG::getAuthGPG()->SignCertificateLevel0(id);
AuthGPG::getAuthGPG()->setAcceptToConnectGPGCertificate(id, true); AuthGPG::getAuthGPG()->setAcceptToConnectGPGCertificate(id, true);
return true; return AuthGPG::getAuthGPG()->SignCertificateLevel0(id);
} }
bool p3Peers::setAcceptToConnectGPGCertificate(std::string gpg_id, bool acceptance) bool p3Peers::setAcceptToConnectGPGCertificate(std::string gpg_id, bool acceptance)

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

@ -162,8 +162,8 @@ void StartDialog::loadCertificates()
{ {
/* some error msg */ /* some error msg */
QMessageBox::StandardButton sb = QMessageBox::warning ( NULL, QMessageBox::StandardButton sb = QMessageBox::warning ( NULL,
"Login Failure", tr("Login Failure"),
"*** Wrong Password ***", tr("Maybe password is wrong"),
QMessageBox::Ok); QMessageBox::Ok);
} }
} }
@ -174,8 +174,8 @@ void StartDialog::on_labelProfile_linkActivated(QString link)
//gencertdialog->show(); //gencertdialog->show();
QMessageBox::StandardButton sb = QMessageBox::question ( NULL, QMessageBox::StandardButton sb = QMessageBox::question ( NULL,
"Create a New Profil", tr("Create a New Profil"),
"This will generate a new Profile\n Are you sure you want to continue", tr("This will generate a new Profile\n Are you sure you want to continue"),
(QMessageBox::Ok | QMessageBox::No)); (QMessageBox::Ok | QMessageBox::No));
if (sb == QMessageBox::Ok) if (sb == QMessageBox::Ok)

7
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -340,7 +340,12 @@ void ConfCertDialog::denyFriend() {
void ConfCertDialog::signGPGKey() { void ConfCertDialog::signGPGKey() {
std::string gpg_id = rsPeers->getGPGId(mId); std::string gpg_id = rsPeers->getGPGId(mId);
rsPeers->signGPGCertificate(gpg_id); if (!rsPeers->signGPGCertificate(gpg_id)) {
QMessageBox::StandardButton sb = QMessageBox::warning ( NULL,
tr("Signature Failure"),
tr("Maybe password is wrong"),
QMessageBox::Ok);
}
loadDialog(); loadDialog();
} }