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

updated v0.6-Circles with latest trunk

Browse source
This commit is contained in:
csoler 2016-01-01 22:18:43 -05:00
commit 8ec0e10019
10 changed files with 142 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/rsserver/p3face-server.cc
View file

@ -93,6 +93,7 @@ RsServer::RsServer()
msgSrv = NULL;
chatSrv = NULL;
mStatusSrv = NULL;
mGxsTunnels = NULL;
mMin = 0;
mLoop = 0;

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

@ -1372,12 +1372,11 @@ int RsServer::StartupRetroShare()
/**** Wiki GXS service ****/
#ifdef RS_USE_WIKI
RsGeneralDataService* wiki_ds = new RsDataService(currGxsDir + "/", "wiki_db",
RS_SERVICE_GXS_TYPE_WIKI,
NULL, rsInitConfig->gxs_passwd);
#ifdef RS_USE_WIKI
p3Wiki *mWiki = new p3Wiki(wiki_ds, NULL, mGxsIdService);
// create GXS wiki service
RsGxsNetService* wiki_ns = new RsGxsNetService(