Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compilation of rs-nogui

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-19 12:42:27 +00:00
parent 4907d29156
commit 2c0a22b68e
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroshare-nogui/src/notifytxt.cc
View File

@ -144,8 +144,8 @@ void NotifyTxt::notifyListChange(int list, int type)
void NotifyTxt::displayNeighbours() void NotifyTxt::displayNeighbours()
{ {
std::list<std::string> neighs; std::list<RsPgpId> neighs;
std::list<std::string>::iterator it; std::list<RsPgpId>::iterator it;
rsPeers->getGPGAllList(neighs); rsPeers->getGPGAllList(neighs);
@ -153,7 +153,7 @@ void NotifyTxt::displayNeighbours()
for(it = neighs.begin(); it != neighs.end(); it++) for(it = neighs.begin(); it != neighs.end(); it++)
{ {
RsPeerDetails detail; RsPeerDetails detail;
rsPeers->getPeerDetails(*it, detail); rsPeers->getGPGDetails(*it, detail);
out << "Neighbour: "; out << "Neighbour: ";
out << detail; out << detail;
@ -164,8 +164,8 @@ void NotifyTxt::displayNeighbours()
void NotifyTxt::displayFriends() void NotifyTxt::displayFriends()
{ {
std::list<std::string> ids; std::list<RsPeerId> ids;
std::list<std::string>::iterator it; std::list<RsPeerId>::iterator it;
rsPeers->getFriendList(ids); rsPeers->getFriendList(ids);

9
retroshare-nogui/src/retroshare.cc
View File

@ -24,15 +24,6 @@
* *
*/ */
#error "******************************************************************************************************************"
#error "**** Retroshare trunk/ is currently being merged to v0.6 and protocols are not stable. It is unlikely that *****"
#error "**** you want to compile the trunk now. *****"
#error "**** *****"
#error "**** To compile the latest Retroshare 0.5.5, please go to branches/v0.5.5 *****"
#error "**** *****"
#error "**** --- The dev team --- *****"
#error "******************************************************************************************************************"
#include <retroshare/rsiface.h> /* definition of iface */ #include <retroshare/rsiface.h> /* definition of iface */
#include <retroshare/rsinit.h> /* definition of iface */ #include <retroshare/rsinit.h> /* definition of iface */