Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fixed inconsistency in parameter naming, causing error_string to be mixed up with gpg id (Not a bug).

Browse source 
- removed unimplemented entry loadCertificateFromFile()


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-01-19 13:43:35 +00:00
parent 13f2863569
commit e7536960c3
6 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -544,9 +544,9 @@ void ConnectFriendWizard::accept()
if (!mCertificate.empty() && (accept_connection || sign))
{
std::string ssl_id, pgp_id ;
std::string pgp_id,ssl_id,error_string ;
if(!rsPeers->loadCertificateFromString(mCertificate,ssl_id,pgp_id))
if(!rsPeers->loadCertificateFromString(mCertificate,ssl_id,pgp_id,error_string))
{
std::cerr << "ConnectFriendWizard::accept(): cannot load that certificate." << std::endl;
return ;