mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-27 10:05:51 -04:00
Merging branches/v0.6-initdev into trunk.
These split at 6672 -> 7075, so quite a bit merge. libretroshare compiles - but untested. retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors). some plugins will be broken. retroshare-nogui is untested. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
commit
c0738eec7f
407 changed files with 23716 additions and 50779 deletions
|
@ -186,7 +186,7 @@ void NetworkView::updateDisplay()
|
|||
}
|
||||
|
||||
std::list<std::string> friendList;
|
||||
rsDisc->getDiscGPGFriends(info.gpg_id, friendList);
|
||||
rsDisc->getDiscPgpFriends(info.gpg_id, friendList);
|
||||
|
||||
#ifdef DEBUG_NETWORKVIEW
|
||||
std::cerr << " Got a list of " << friendList.size() << " friends for this peer." << std::endl ;
|
||||
|
@ -214,7 +214,7 @@ void NetworkView::updateDisplay()
|
|||
{
|
||||
std::list<std::string> friendList ;
|
||||
|
||||
if(rsDisc->getDiscGPGFriends(it->first,friendList))
|
||||
if(rsDisc->getDiscPgpFriends(it->first,friendList))
|
||||
for(std::list<std::string>::const_iterator sit(friendList.begin()); sit != friendList.end(); sit++)
|
||||
{
|
||||
#ifdef DEBUG_NETWORKVIEW
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue