bug fix: open correct message window for send when using subcontact windows

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@413 4f64403b-2f21-0410-a795-97e2b3489a10

5 files changed, 144 insertions, 426 deletions

diff --git a/metacontacts/MetaContacts.mdsp b/metacontacts/MetaContacts.mdsp
index 54204c5..d7f19bf 100644
--- a/metacontacts/MetaContacts.mdsp
+++ b/metacontacts/MetaContacts.mdsp
@@ -99,4 +99,4 @@ extraResourceOptions=
 1=resource.rc

 [Other]

 [History]

-meta_options.c,25290

+meta_options.c,25271

diff --git a/metacontacts/MetaContacts_9.sln b/metacontacts/MetaContacts_9.sln
new file mode 100644
index 0000000..29ed923
--- /dev/null
+++ b/metacontacts/MetaContacts_9.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaContacts", "MetaContacts_9.vcproj", "{8B5D2F98-8F24-4F26-8E8B-00857F37530E}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.Build.0 = Debug|Win32

+		{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.ActiveCfg = Release|Win32

+		{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/metacontacts/MetaContacts_9.vcproj b/metacontacts/MetaContacts_9.vcproj
index 839752a..bbd2de5 100644
--- a/metacontacts/MetaContacts_9.vcproj
+++ b/metacontacts/MetaContacts_9.vcproj
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="windows-1251"?>

+<?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="MetaContacts"

-	ProjectGUID="{0007BE9F-DD4D-4E9B-B1C8-C5049538F862}"

+	ProjectGUID="{8B5D2F98-8F24-4F26-8E8B-00857F37530E}"

 	RootNamespace="MetaContacts"

 	Keyword="MFCProj"

 	TargetFrameworkVersion="131072"

@@ -17,196 +17,11 @@
 	</ToolFiles>

 	<Configurations>

 		<Configuration

-			Name="Release|Win32"

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

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

-			ConfigurationType="2"

-			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/MetaContacts.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="1"

-				EnableIntrinsicFunctions="false"

-				FavorSizeOrSpeed="2"

-				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="metacontacts.h"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DisableSpecificWarnings="4996"

-				ShowIncludes="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="3081"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"

-				LinkIncremental="0"

-				SuppressStartupBanner="true"

-				AdditionalManifestDependencies="type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				LinkTimeCodeGeneration="1"

-				BaseAddress="0x22010000"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				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|Win32"

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

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

-			ConfigurationType="2"

-			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/MetaContacts.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderThrough="metacontacts.h"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-				DisableSpecificWarnings="4996"

-				ShowIncludes="false"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="3081"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				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)"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="2"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -230,7 +45,6 @@
 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

 				TypeLibraryName=".\Debug/MetaContacts.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -238,13 +52,16 @@
 				AdditionalIncludeDirectories="../../include"

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

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="metacontacts.h"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-				DisableSpecificWarnings="4996"

+				DebugInformationFormat="3"

 				ShowIncludes="false"

 			/>

 			<Tool

@@ -252,7 +69,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="_AFXDLL;_DEBUG"

 				Culture="3081"

 			/>

 			<Tool

@@ -260,13 +77,15 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"

-				LinkIncremental="2"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/MetaContacts.pdb"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="1"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -291,14 +110,14 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release Unicode|Win32"

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

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

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="2"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -319,24 +138,24 @@
 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

 				TypeLibraryName=".\Release/MetaContacts.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="3"

+				Optimization="1"

 				InlineFunctionExpansion="1"

-				FavorSizeOrSpeed="2"

-				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../include"

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

 				StringPooling="true"

-				RuntimeLibrary="2"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="metacontacts.h"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DisableSpecificWarnings="4996"

+				DebugInformationFormat="0"

 				ShowIncludes="false"

 			/>

 			<Tool

@@ -344,7 +163,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_AFXDLL;NDEBUG"

 				Culture="3081"

 			/>

 			<Tool

@@ -352,18 +171,16 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"

-				LinkIncremental="0"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalManifestDependencies="type=&apos;Win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;X86&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				LinkTimeCodeGeneration="1"

+				GenerateManifest="false"

+				ProgramDatabaseFile=".\Release/MetaContacts.pdb"

 				BaseAddress="0x22010000"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="1"

+				ImportLibrary="$(IntDir)/$(TargetName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -399,43 +216,21 @@
 				RelativePath="addto.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -443,43 +238,21 @@
 				RelativePath="edit.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -491,43 +264,21 @@
 				RelativePath="meta_api.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -535,46 +286,22 @@
 				RelativePath="meta_main.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-						UsePrecompiledHeader="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						UsePrecompiledHeader="1"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						UsePrecompiledHeader="1"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						UsePrecompiledHeader="1"

 					/>

 				</FileConfiguration>

@@ -583,43 +310,21 @@
 				RelativePath="meta_menu.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -627,43 +332,21 @@
 				RelativePath="meta_options.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -671,43 +354,21 @@
 				RelativePath="meta_services.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -715,43 +376,21 @@
 				RelativePath="meta_utils.c"

 				>

 				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release Unicode|Win32"

+					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						Optimization="2"

-						PreprocessorDefinitions=""

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"

 					/>

 				</FileConfiguration>

 			</File>

@@ -769,7 +408,7 @@
 				>

 			</File>

 			<File

-				RelativePath="VersionNo.h"

+				RelativePath=".\version.h"

 				>

 			</File>

 		</Filter>

@@ -790,13 +429,73 @@
 				>

 			</File>

 			<File

-				RelativePath="MetaContacts.rc"

+				RelativePath=".\meta_add.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\meta_convert.ico"

 				>

 			</File>

 			<File

+				RelativePath=".\meta_edit.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\meta_remove2.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\meta_set_as_default.ico"

+				>

+			</File>

+			<File

+				RelativePath=".\MetaContacts.rc"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="resource.h"

 				>

 			</File>

+			<File

+				RelativePath=".\resource.rc"

+				>

+			</File>

+			<File

+				RelativePath=".\version.rc"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCResourceCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

 		</Filter>

 		<Filter

 			Name="translation template"

diff --git a/metacontacts/meta_utils.c b/metacontacts/meta_utils.c
index f6fcb74..6077117 100644
--- a/metacontacts/meta_utils.c
+++ b/metacontacts/meta_utils.c
@@ -501,7 +501,7 @@ HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long ca
 	if(proto && CallProtoService(proto, PS_GETSTATUS, 0, 0) >= ID_STATUS_ONLINE) {

 		caps = proto ? CallProtoService(proto, PS_GETCAPS, (WPARAM)pflagnum, 0) : 0;

 		if(proto && strcmp(proto, "IRC") == 0) caps |= PF1_IM;

-		if(proto && (caps & capability) == capability) {

+		if(proto && (capability == -1 || (caps & capability) == capability)) {

 			most_online_status = DBGetContactSettingWord(most_online_contact, proto, "Status", ID_STATUS_OFFLINE);

 

 			// if our default is not offline, and option to use default is set - return default

@@ -528,7 +528,7 @@ HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long ca
 

 		caps = proto ? CallProtoService(proto, PS_GETCAPS, (WPARAM)pflagnum, 0) : 0;

 		if(proto && strcmp(proto, "IRC") == 0) caps |= PF1_IM;

-		if(proto && (caps & capability) == capability) {

+		if(proto && (capability == -1 || (caps & capability) == capability)) {

 

 			status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE);

 

diff --git a/metacontacts/version.h b/metacontacts/version.h
index 7b37f33..ecfffcf 100644
--- a/metacontacts/version.h
+++ b/metacontacts/version.h
@@ -5,7 +5,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				14

 #define __RELEASE_NUM				0

-#define __BUILD_NUM					7

+#define __BUILD_NUM					8

 

 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM