mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-02 11:16:34 -04:00
updated GUI for new distant chat
This commit is contained in:
parent
26f4523f5f
commit
a2e0f4196b
17 changed files with 215 additions and 1214 deletions
|
@ -56,6 +56,8 @@
|
|||
#include <openssl/rand.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <gxstunnel/p3gxstunnel.h>
|
||||
|
||||
#define ENABLE_GROUTER
|
||||
|
||||
#if (defined(__unix__) || defined(unix)) && !defined(USG)
|
||||
|
@ -1472,13 +1474,16 @@ int RsServer::StartupRetroShare()
|
|||
pqih -> addService(tr,true);
|
||||
pqih -> addService(ftserver,true);
|
||||
|
||||
p3GxsTunnelService *gxs_tunnels = new p3GxsTunnelService() ;
|
||||
rsGxsTunnels = gxs_tunnels;
|
||||
|
||||
rsDisc = mDisc;
|
||||
rsMsgs = new p3Msgs(msgSrv, chatSrv);
|
||||
|
||||
// connect components to turtle router.
|
||||
|
||||
ftserver->connectToTurtleRouter(tr) ;
|
||||
chatSrv->connectToTurtleRouter(tr) ;
|
||||
chatSrv->connectToxsTunnelService(gxs_tunnels) ;
|
||||
gr->connectToTurtleRouter(tr) ;
|
||||
#ifdef ENABLE_GROUTER
|
||||
msgSrv->connectToGlobalRouter(gr) ;
|
||||
|
@ -1489,8 +1494,7 @@ int RsServer::StartupRetroShare()
|
|||
pqih -> addService(mDisc,true);
|
||||
pqih -> addService(msgSrv,true);
|
||||
pqih -> addService(chatSrv,true);
|
||||
pqih -> addService(mStatusSrv,true);
|
||||
|
||||
pqih -> addService(mStatusSrv,true);
|
||||
|
||||
// set interfaces for plugins
|
||||
//
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue