Tox:

- removed own logger
- bootstrap splitted into two functions: udp and tcp

git-svn-id: http://svn.miranda-ng.org/main/trunk@16801 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 7 insertions, 7 deletions

diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp
index 9910f8cc1f..4f338db5cc 100644
--- a/protocols/Tox/src/tox_core.cpp
+++ b/protocols/Tox/src/tox_core.cpp
@@ -6,23 +6,23 @@ Tox_Options* CToxProto::GetToxOptions()
 	Tox_Options *options = tox_options_new(&error);

 	if (error != TOX_ERR_OPTIONS_NEW_OK)

 	{

-		logger->Log(__FUNCTION__": failed to initialize tox options (%d)", error);

+		debugLogA(__FUNCTION__": failed to initialize tox options (%d)", error);

 		return NULL;

 	}

 

 	options->udp_enabled = getBool("EnableUDP", 1);

 	options->ipv6_enabled = getBool("EnableIPv6", 0);

 

-	if (hNetlib != NULL)

+	if (m_hNetlibUser != NULL)

 	{

 		NETLIBUSERSETTINGS nlus = { sizeof(NETLIBUSERSETTINGS) };

-		CallService(MS_NETLIB_GETUSERSETTINGS, (WPARAM)hNetlib, (LPARAM)&nlus);

+		CallService(MS_NETLIB_GETUSERSETTINGS, (WPARAM)m_hNetlibUser, (LPARAM)&nlus);

 

 		if (nlus.useProxy)

 		{

 			if (nlus.proxyType == PROXYTYPE_HTTP || nlus.proxyType == PROXYTYPE_HTTPS)

 			{

-				logger->Log("CToxProto::InitToxCore: setting http user proxy config");

+				debugLogA(__FUNCTION__": setting http user proxy config");

 				options->proxy_type = TOX_PROXY_TYPE_HTTP;

 				mir_strcpy((char*)&options->proxy_host[0], nlus.szProxyServer);

 				options->proxy_port = nlus.wProxyPort;

@@ -30,7 +30,7 @@ Tox_Options* CToxProto::GetToxOptions()
 

 			if (nlus.proxyType == PROXYTYPE_SOCKS4 || nlus.proxyType == PROXYTYPE_SOCKS5)

 			{

-				logger->Log(__FUNCTION__": setting socks user proxy config");

+				debugLogA(__FUNCTION__": setting socks user proxy config");

 				options->proxy_type = TOX_PROXY_TYPE_SOCKS5;

 				mir_strcpy((char*)&options->proxy_host[0], nlus.szProxyServer);

 				options->proxy_port = nlus.wProxyPort;

@@ -50,7 +50,7 @@ Tox_Options* CToxProto::GetToxOptions()
 

 bool CToxProto::InitToxCore(CToxThread *toxThread)

 {

-	logger->Log(__FUNCTION__": initializing tox core");

+	debugLogA(__FUNCTION__": initializing tox core");

 

 	if (toxThread == NULL)

 		return false;

@@ -65,7 +65,7 @@ bool CToxProto::InitToxCore(CToxThread *toxThread)
 		toxThread->Tox() = tox_new(options, &initError);

 		if (initError != TOX_ERR_NEW_OK)

 		{

-			logger->Log(__FUNCTION__": failed to initialize tox core (%d)", initError);

+			debugLogA(__FUNCTION__": failed to initialize tox core (%d)", initError);

 			ShowNotification(ToxErrorToString(initError), TranslateT("Unable to initialize Tox core"), MB_ICONERROR);

 			tox_options_free(options);

 			return false;