make peer detail gui work for the gpg and the ssl id

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:12:56 +00:00
parent 41600dc3cf
commit dabe44356a
6 changed files with 49 additions and 33 deletions

View file

@ -301,7 +301,10 @@ bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
std::cerr << std::endl;
#endif
/* get from mAuthMgr (first) */
/* get from gpg (first), to fill in the sign and trust details */
this->getPGPDetails(AuthSSL::getAuthSSL()->getGPGId(id), d);
//get the ssl details
sslcert authDetail;
if (!AuthSSL::getAuthSSL()->getCertDetails(id, authDetail))
{
@ -310,17 +313,12 @@ bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
d.fpr = authDetail.fpr;
d.id = authDetail.id;
d.name = authDetail.name;
d.email = authDetail.email;
//d.name = authDetail.name;
//d.email = authDetail.email;
d.location = authDetail.location;
d.org = authDetail.org;
d.gpgSigners = authDetail.signers;
d.issuer = authDetail.issuer;
d.ownsign = AuthGPG::getAuthGPG()->isPGPSigned(AuthSSL::getAuthSSL()->getGPGId(id));
/* generate */
d.authcode = "AUTHCODE";