update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-27 22:31:25 +00:00
parent fb5bbf2e96
commit e142c63180
16 changed files with 1189 additions and 1588 deletions

View file

@ -144,12 +144,15 @@ p3ConnectMgr::p3ConnectMgr()
ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName();
ownState.location = AuthSSL::getAuthSSL()->getOwnLocation();
ownState.netMode = RS_NET_MODE_UDP;
ownState.netMode |= RS_NET_MODE_TRY_UPNP;
//use_extr_addr_finder = true ;
use_extr_addr_finder = false;
allow_tunnel_connection = true;
mExtAddrFinder = new ExtAddrFinder;
netReset();
return;
}
@ -2707,10 +2710,9 @@ bool p3ConnectMgr::setVisState(std::string id, uint32_t visState)
{
if (id == AuthSSL::getAuthSSL()->OwnId())
{
uint32_t netMode = ownState.netMode;
setOwnNetConfig(netMode, visState);
return true;
ownState.visState = visState;
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
return true;
}
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/