From 7ffe7eba0b18fc706234002e21741f6f22496e7d Mon Sep 17 00:00:00 2001
From: bossiel <bossiel@yahoo.fr>
Date: Mon, 8 Jun 2015 08:58:39 +0000
Subject: [PATCH] Update tinyNET VS proj to include "common" folder Use ICE new
 API for the video part in the SIP dialog

---
 branches/2.0/doubango/tinyNET/tinyNET.vcproj                | 6 +++---
 .../doubango/tinySIP/src/dialogs/tsip_dialog_invite.ice.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/branches/2.0/doubango/tinyNET/tinyNET.vcproj b/branches/2.0/doubango/tinyNET/tinyNET.vcproj
index 2b1d1fa3..c968ac5c 100644
--- a/branches/2.0/doubango/tinyNET/tinyNET.vcproj
+++ b/branches/2.0/doubango/tinyNET/tinyNET.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tinyNET"
 	ProjectGUID="{7522A458-92F4-4259-B906-E84C2A65D9F1}"
 	RootNamespace="tinyNET"
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src;&quot;..\thirdparties\win32\include&quot;;&quot;..\tinySAK\src&quot;"
+				AdditionalIncludeDirectories="src;..\thirdparties\win32\include;..\thirdparties\common\include;..\tinySAK\src"
 				PreprocessorDefinitions="DEBUG_LEVEL=DEBUG_LEVEL_INFO;HAVE_OPENSSL=1;WIN32;_WIN32_WINNT=0x0501;_DEBUG;_WINDOWS;_USRDLL;TINYNET_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="src;&quot;..\thirdparties\win32\include&quot;;&quot;..\tinySAK\src&quot;"
+				AdditionalIncludeDirectories="src;..\thirdparties\win32\include;..\thirdparties\common\include;..\tinySAK\src"
 				PreprocessorDefinitions="DEBUG_LEVEL=DEBUG_LEVEL_ERROR;HAVE_OPENSSL=1;WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USRDLL;TINYNET_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
diff --git a/branches/2.0/doubango/tinySIP/src/dialogs/tsip_dialog_invite.ice.c b/branches/2.0/doubango/tinySIP/src/dialogs/tsip_dialog_invite.ice.c
index 18b66f14..84d55269 100644
--- a/branches/2.0/doubango/tinySIP/src/dialogs/tsip_dialog_invite.ice.c
+++ b/branches/2.0/doubango/tinySIP/src/dialogs/tsip_dialog_invite.ice.c
@@ -169,7 +169,7 @@ static int tsip_dialog_invite_ice_create_ctx(tsip_dialog_invite_t * self, tmedia
 			TSK_DEBUG_ERROR("Failed to create ICE video context");
 			return -2;
 		}
-#if 1 // @deprecated
+#if 0 // @deprecated
 		ret = tnet_ice_ctx_set_stun(self->ice.ctx_video, TSIP_DIALOG_GET_SS(self)->media.stun.hostname, TSIP_DIALOG_GET_SS(self)->media.stun.port, kStunSoftware, TSIP_DIALOG_GET_SS(self)->media.stun.username, TSIP_DIALOG_GET_SS(self)->media.stun.password);
 #else
 		ret = tnet_ice_ctx_add_server(