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 { gxs {
DEFINES *= RS_ENABLE_GXS DEFINES *= RS_ENABLE_GXS
#DEFINES *= GXS_DEV_TESTNET # DEFINES *= GXS_DEV_TESTNET
#DEFINES *= GXS_ENABLE_SYNC_MSGS # DEFINES *= GXS_ENABLE_SYNC_MSGS
HEADERS += serialiser/rsnxsitems.h \ HEADERS += serialiser/rsnxsitems.h \
gxs/rsgds.h \ gxs/rsgds.h \

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

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

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

@ -2273,7 +2273,7 @@ int RsServer::StartupRetroShare()
std::string currGxsDir = RsInitConfig::configDir + "/GXS_phase1"; std::string currGxsDir = RsInitConfig::configDir + "/GXS_phase1";
#ifdef GXS_DEV_TESTNET // Different Directory for testing. #ifdef GXS_DEV_TESTNET // Different Directory for testing.
currGxsDir += "_TESTNET2"; currGxsDir += "_TESTNET3";
#endif #endif
bool cleanUpGxsDir = false; bool cleanUpGxsDir = false;
@ -2429,8 +2429,8 @@ int RsServer::StartupRetroShare()
// now add to p3service // now add to p3service
pqih->addService(gxsid_ns); pqih->addService(gxsid_ns);
pqih->addService(gxscircles_ns); //pqih->addService(gxscircles_ns);
pqih->addService(photo_ns); //pqih->addService(photo_ns);
pqih->addService(posted_ns); pqih->addService(posted_ns);
pqih->addService(wiki_ns); pqih->addService(wiki_ns);
pqih->addService(gxsforums_ns); pqih->addService(gxsforums_ns);
@ -2670,7 +2670,7 @@ int RsServer::StartupRetroShare()
/*** start up GXS core runner ***/ /*** start up GXS core runner ***/
createThread(*mGxsIdService); createThread(*mGxsIdService);
createThread(*mGxsCircles); createThread(*mGxsCircles);
createThread(*mPhoto); //createThread(*mPhoto);
createThread(*mPosted); createThread(*mPosted);
createThread(*mWiki); createThread(*mWiki);
createThread(*mWire); 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), ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp)); createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
CirclesDialog *circlesDialog = NULL; // CirclesDialog *circlesDialog = NULL;
ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages), // ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp)); // createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
PhotoShare *photoShare = NULL; // PhotoShare *photoShare = NULL;
ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages), // ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp)); // createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
PostedDialog *postedDialog = NULL; PostedDialog *postedDialog = NULL;
ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages), 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 #CONFIG += gxs debug
gxs { gxs {
CONFIG += photoshare # CONFIG += photoshare
CONFIG += wikipoos CONFIG += wikipoos
CONFIG += identities CONFIG += identities
CONFIG += circles # CONFIG += circles
CONFIG += gxsforums CONFIG += gxsforums
CONFIG += gxschannels CONFIG += gxschannels
CONFIG += posted CONFIG += posted