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

user test version

Browse source 
- disabled circles and photoshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-04-04 17:23:10 +00:00
parent 7c34736f56
commit 9a37bde4c8
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/libretroshare.pro
View file

@ -614,8 +614,8 @@ SOURCES += zeroconf/p3zcnatassist.cc \
gxs {
DEFINES *= RS_ENABLE_GXS
#DEFINES *= GXS_DEV_TESTNET
#DEFINES *= GXS_ENABLE_SYNC_MSGS
# DEFINES *= GXS_DEV_TESTNET
# DEFINES *= GXS_ENABLE_SYNC_MSGS
HEADERS += serialiser/rsnxsitems.h \
gxs/rsgds.h \

4
libretroshare/src/rsserver/p3face-config.cc
View file

@ -159,12 +159,12 @@ void RsServer::rsGlobalShutDown()
#ifdef RS_ENABLE_GXS
if(mGxsCircles) mGxsCircles->join();
//if(mGxsCircles) mGxsCircles->join();
if(mGxsForums) mGxsForums->join();
if(mGxsChannels) mGxsChannels->join();
if(mGxsIdService) mGxsIdService->join();
if(mPosted) mPosted->join();
if(mPhoto) mPhoto->join();
//if(mPhoto) mPhoto->join();
if(mWiki) mWiki->join();
if(mWire) mWire->join();
#endif

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

@ -2273,7 +2273,7 @@ int RsServer::StartupRetroShare()
std::string currGxsDir = RsInitConfig::configDir + "/GXS_phase1";
#ifdef GXS_DEV_TESTNET // Different Directory for testing.
currGxsDir += "_TESTNET2";
currGxsDir += "_TESTNET3";
#endif
bool cleanUpGxsDir = false;
@ -2429,8 +2429,8 @@ int RsServer::StartupRetroShare()
// now add to p3service
pqih->addService(gxsid_ns);
pqih->addService(gxscircles_ns);
pqih->addService(photo_ns);
//pqih->addService(gxscircles_ns);
//pqih->addService(photo_ns);
pqih->addService(posted_ns);
pqih->addService(wiki_ns);
pqih->addService(gxsforums_ns);
@ -2670,7 +2670,7 @@ int RsServer::StartupRetroShare()
/*** start up GXS core runner ***/
createThread(*mGxsIdService);
createThread(*mGxsCircles);
createThread(*mPhoto);
//createThread(*mPhoto);
createThread(*mPosted);
createThread(*mWiki);
createThread(*mWire);