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

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
Show Stats 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);

12
retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
View File

@ -93,13 +93,13 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
CirclesDialog *circlesDialog = NULL;
ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
// CirclesDialog *circlesDialog = NULL;
// ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
PhotoShare *photoShare = NULL;
ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
// PhotoShare *photoShare = NULL;
// ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
// createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
PostedDialog *postedDialog = NULL;
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -5,10 +5,10 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht
#CONFIG += gxs debug
gxs {
CONFIG += photoshare
# CONFIG += photoshare
CONFIG += wikipoos
CONFIG += identities
CONFIG += circles
# CONFIG += circles
CONFIG += gxsforums
CONFIG += gxschannels
CONFIG += posted