- minor crash fix;

- project fixes

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@135 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

3 files changed, 199 insertions, 13 deletions

diff --git a/gtalkext/GTalkExt.vcproj b/gtalkext/GTalkExt.vcproj
index eb59d4e..a529494 100644
--- a/gtalkext/GTalkExt.vcproj
+++ b/gtalkext/GTalkExt.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			>

@@ -41,11 +41,11 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="include"

+				AdditionalIncludeDirectories="../../include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

@@ -62,7 +62,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				ShowProgress="1"

-				OutputFile="C:\Users\Серега\Documents\My Dropbox\Miranda IM\Binaries\Plugins\$(ProjectName).dll"

 				LinkIncremental="2"

 				AdditionalLibraryDirectories=""

 				GenerateDebugInformation="true"

@@ -93,8 +92,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

 			ConfigurationType="2"

 			CharacterSet="1"

 			WholeProgramOptimization="1"

@@ -118,8 +117,162 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS"

-				RuntimeLibrary="0"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug Unicode|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="2"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				ShowProgress="1"

+				LinkIncremental="2"

+				AdditionalLibraryDirectories=""

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release Unicode|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			ConfigurationType="2"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="3"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../../include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS"

+				StringPooling="true"

+				ExceptionHandling="0"

+				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="2"

 				WarningLevel="3"

@@ -136,7 +289,6 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="C:\Program Files\Miranda IM\plugins\$(ProjectName).dll"

 				LinkIncremental="1"

 				GenerateDebugInformation="true"

 				SubSystem="2"

@@ -204,6 +356,24 @@
 						CompileAsManaged="0"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+						CompileAsManaged="0"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="0"

+						CompileAsManaged="0"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\GTalkExt.cpp"

@@ -252,6 +422,22 @@
 						UsePrecompiledHeader="1"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\tipper_items.cpp"

diff --git a/gtalkext/GTalkExt.vcxproj b/gtalkext/GTalkExt.vcxproj
index 513becd..411912d 100644
--- a/gtalkext/GTalkExt.vcxproj
+++ b/gtalkext/GTalkExt.vcxproj
@@ -168,7 +168,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <ShowProgress>LinkVerbose</ShowProgress>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

@@ -206,7 +205,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <ShowProgress>LinkVerbose</ShowProgress>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

diff --git a/gtalkext/handlers.cpp b/gtalkext/handlers.cpp
index 2bcd457..879e5ee 100644
--- a/gtalkext/handlers.cpp
+++ b/gtalkext/handlers.cpp
@@ -255,8 +255,10 @@ void RequestMail(LPCTSTR jidWithRes, IJabberInterface *ji)
 			if (lastThreadId) free(lastThreadId);

 		}

 

-		if (ji->Net()->SendXmlNode(node))

-			ji->Net()->AddTemporaryIqHandler(MailListHandler, JABBER_IQ_TYPE_RESULT, (int)uID, NULL, RESPONSE_TIMEOUT);

+		IJabberNetInterface* piNet = ji->Net();

+		if ( piNet )

+			if (piNet->SendXmlNode(node))

+				piNet->AddTemporaryIqHandler(MailListHandler, JABBER_IQ_TYPE_RESULT, (int)uID, NULL, RESPONSE_TIMEOUT);

 	}

 	__finally {

 		if (child) xi.destroyNode(child);