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

make peer details work for GPG key in the network view gui

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:11:02 +00:00
parent 77b3c0afd0
commit 41600dc3cf
13 changed files with 472 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ ConnectFriendWizard::accept()
std::string authId = field("idField").toString().toStdString();
std::string authCode = field("authCode").toString().toStdString();
rsPeers->AuthCertificate(authId, authCode );
//rsPeers->AuthCertificate(authId, authCode );
rsPeers->addFriend(authId);
//let's check if there is ip adresses in the wizard.
@ -485,7 +485,7 @@ void FofPage::updatePeersList(int e)
std::set<std::string> common_friends ;
for(std::list<std::string>::const_iterator it2(details.signers.begin());it2!=details.signers.end();++it2)
for(std::list<std::string>::const_iterator it2(details.gpgSigners.begin());it2!=details.gpgSigners.end();++it2)
if(my_friends_names.find(*it2) != my_friends_names.end() && *it2 != details.name)
common_friends.insert(*it2) ;
@ -565,7 +565,7 @@ void FofPage::signAllSelectedUsers()
if(it->first->isChecked())
{
std::cerr << "Making friend with " << it->second << std::endl ;
rsPeers->AuthCertificate(it->second, "");
//rsPeers->AuthCertificate(it->second, "");
rsPeers->addFriend(it->second);
}
@ -868,7 +868,7 @@ ConclusionPage::initializePage()
QString ts;
std::list<std::string>::iterator it;
for(it = detail.signers.begin(); it != detail.signers.end(); it++)
for(it = detail.gpgSigners.begin(); it != detail.gpgSigners.end(); it++)
{
ts.append(QString::fromStdString( rsPeers->getPeerName(*it) ));
ts.append( "<" ) ;