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

make it run

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:01:06 +00:00
parent a0a64fb588
commit 9d53481946
16 changed files with 54 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/rsserver/p3face.h
View file

@ -161,7 +161,6 @@ class RsServer: public RsControl, public RsThread
ftServer *ftserver;
p3ConnectMgr *mConnMgr;
p3AuthMgr *mAuthMgr;
pqipersongrp *pqih;

6
libretroshare/src/rsserver/p3msgs.h
View file

@ -28,7 +28,6 @@
#include "rsiface/rsmsgs.h"
class p3AuthMgr;
class p3MsgService;
class p3ChatService;
@ -38,8 +37,8 @@ class p3Msgs: public RsMsgs
{
public:
p3Msgs(p3AuthMgr *p3a, p3MsgService *p3m, p3ChatService *p3c)
:mAuthMgr(p3a), mMsgSrv(p3m), mChatSrv(p3c) { return; }
p3Msgs(p3MsgService *p3m, p3ChatService *p3c)
:mMsgSrv(p3m), mChatSrv(p3c) { return; }
virtual ~p3Msgs() { return; }
/****************************************/
@ -78,7 +77,6 @@ class p3Msgs: public RsMsgs
void initRsChatInfo(RsChatMsgItem *c, ChatInfo &i);
p3AuthMgr *mAuthMgr;
p3MsgService *mMsgSrv;
p3ChatService *mChatSrv;
};

24
libretroshare/src/rsserver/p3peers.cc
View file

@ -308,15 +308,15 @@ bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
return false;
}
d.fpr = authDetail.fpr;
d.id = authDetail.id;
d.name = authDetail.name;
d.email = authDetail.email;
d.location = authDetail.location;
d.org = authDetail.org;
d.signers = authDetail.signers;
d.fpr = authDetail.fpr;
d.id = authDetail.id;
d.name = authDetail.name;
d.email = authDetail.email;
d.location = authDetail.location;
d.org = authDetail.org;
d.signers = authDetail.signers;
d.issuer = authDetail.issuer;
d.issuer = authDetail.issuer;
d.trusted = AuthGPG::getAuthGPG()->isPGPAuthenticated(AuthSSL::getAuthSSL()->getGPGId(id));
@ -509,7 +509,7 @@ bool p3Peers::getPGPFriendList(std::list<std::string> &ids)
#ifdef P3PEERS_DEBUG
std::cerr << "p3Peers::getPGPFriendList() Cert Id: " << *it;
std::cerr << " Issuer: " << detail.issuer;
std::cerr << " Issuer: " << detail.issuer;
std::cerr << std::endl;
#endif
@ -520,16 +520,16 @@ bool p3Peers::getPGPFriendList(std::list<std::string> &ids)
}
#endif
if (ids.end() == std::find(ids.begin(),ids.end(),detail.issuer))
if (ids.end() == std::find(ids.begin(),ids.end(),detail.issuer))
{
#ifdef P3PEERS_DEBUG
std::cerr << "p3Peers::getPGPFriendList() Adding Friend: ";
std::cerr << detail.issuer;
std::cerr << detail.issuer;
std::cerr << std::endl;
#endif
ids.push_back(detail.issuer);
ids.push_back(detail.issuer);
}
}
return true;

2
libretroshare/src/rsserver/rsinit.cc
View file

@ -2133,7 +2133,7 @@ int RsServer::StartupRetroShare()
/* Setup GUI Interfaces. */
rsPeers = new p3Peers(mConnMgr);
rsMsgs = new p3Msgs(mAuthMgr, msgSrv, chatSrv);
rsMsgs = new p3Msgs(msgSrv, chatSrv);
rsDisc = new p3Discovery(ad);
rsForums = mForums;