diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify.vcproj | 306 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify_10.sln | 26 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj | 22 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/NewXstatusNotify_9.vcproj | 365 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/common.h | 18 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/options.cpp | 46 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/xstatus.h | 6 |
7 files changed, 51 insertions, 738 deletions
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify.vcproj b/plugins/NewXstatusNotify/NewXstatusNotify.vcproj deleted file mode 100644 index 4349e3c71e..0000000000 --- a/plugins/NewXstatusNotify/NewXstatusNotify.vcproj +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="NewXstatusNotify"
- ProjectGUID="{E509A8AE-2BB2-488B-A262-D080300CDA91}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="vc7to6.lib winmm.lib comctl32.lib"
- OutputFile="$(ConfigurationName)\$(ProjectName).dll"
- LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- IgnoreAllDefaultLibraries="FALSE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/NewXstatusNotify.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="2"
- AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="vc7to6.lib winmm.lib comctl32.lib"
- OutputFile="$(ConfigurationName)\$(ProjectName).dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib"
- IgnoreAllDefaultLibraries="TRUE"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress=""
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug Unicode|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="4"
- CompileAs="2"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib comctl32.lib"
- OutputFile="d:\Development\TEST\miranda-im-v0.9.3-unicode\plugins\$(ProjectName).dll"
- LinkIncremental="2"
- SuppressStartupBanner="FALSE"
- AdditionalLibraryDirectories="..\..\lib"
- IgnoreAllDefaultLibraries="FALSE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/NewXstatusNotify.pdb"
- SubSystem="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release Unicode|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="TRUE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="2"
- OmitFramePointers="FALSE"
- EnableFiberSafeOptimizations="FALSE"
- OptimizeForWindowsApplication="FALSE"
- AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="vc7to6.lib winmm.lib comctl32.lib"
- OutputFile="$(ConfigurationName)\$(ProjectName).dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib"
- IgnoreAllDefaultLibraries="TRUE"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress=""
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath=".\indsnd.cpp">
- </File>
- <File
- RelativePath=".\main.cpp">
- </File>
- <File
- RelativePath=".\options.cpp">
- </File>
- <File
- RelativePath=".\popup.cpp">
- </File>
- <File
- RelativePath=".\utils.cpp">
- </File>
- <File
- RelativePath=".\xstatus.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath=".\common.h">
- </File>
- <File
- RelativePath=".\indsnd.h">
- </File>
- <File
- RelativePath=".\options.h">
- </File>
- <File
- RelativePath=".\popup.h">
- </File>
- <File
- RelativePath=".\resource.h">
- </File>
- <File
- RelativePath=".\utils.h">
- </File>
- <File
- RelativePath=".\version.h">
- </File>
- <File
- RelativePath=".\xstatus.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- <File
- RelativePath=".\resource.rc">
- </File>
- <File
- RelativePath=".\version.rc">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.sln b/plugins/NewXstatusNotify/NewXstatusNotify_10.sln deleted file mode 100644 index 7a420272c0..0000000000 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.sln +++ /dev/null @@ -1,26 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "NewXstatusNotify_10.vcxproj", "{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug Unicode|Win32 = Debug Unicode|Win32
- Debug Unicode|x64 = Debug Unicode|x64
- Release Unicode|Win32 = Release Unicode|Win32
- Release Unicode|x64 = Release Unicode|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
- {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release Unicode|x64.Build.0 = Release Unicode|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj index 37ef8fe327..e1f847cf07 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj +++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj @@ -20,7 +20,7 @@ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>NewXstatusNotify</ProjectName>
- <ProjectGuid>{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}</ProjectGuid>
+ <ProjectGuid>{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260}</ProjectGuid>
<RootNamespace>NewStatusNotify</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -68,16 +68,16 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">../../../Files/Release/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(Configuration)64\</IntDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</IgnoreImportLibrary>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</IgnoreImportLibrary>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">../../../Files/Debug/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(Configuration)64\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />
@@ -91,6 +91,7 @@ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">newxstatusnotify</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">newxstatusnotify</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
<Midl>
@@ -114,7 +115,7 @@ <AdditionalIncludeDirectories>../../include;../../ExternalAPI</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
@@ -145,7 +146,6 @@ </DataExecutionPrevention>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
@@ -169,7 +169,7 @@ <AdditionalIncludeDirectories>..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
@@ -192,6 +192,7 @@ <AdditionalOptions>/release %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>
@@ -289,6 +290,7 @@ </ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<Version>
</Version>
<SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_9.vcproj b/plugins/NewXstatusNotify/NewXstatusNotify_9.vcproj deleted file mode 100644 index ae4a1ddb88..0000000000 --- a/plugins/NewXstatusNotify/NewXstatusNotify_9.vcproj +++ /dev/null @@ -1,365 +0,0 @@ -<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="NewXstatusNotify"
- ProjectGUID="{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}"
- RootNamespace="NewStatusNotify"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release Unicode|Win32"
- OutputDirectory="../../../Files/Release/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="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/NewStatusNotify.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE"
/D "_CRT_NON_CONFORMING_SWPRINTFS""
- Optimization="3"
- InlineFunctionExpansion="1"
- FavorSizeOrSpeed="2"
- OmitFramePointers="true"
- EnableFiberSafeOptimizations="false"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include;../../ExternalAPI"
- StringPooling="true"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=""
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- IgnoreImportLibrary="true"
- AdditionalOptions="/release"
- AdditionalDependencies="winmm.lib comctl32.lib"
- AdditionalLibraryDirectories=""
- ModuleDefinitionFile=""
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- BaseAddress="0x25010000"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(IntDir)/$(TargetName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="$(IntDir)/$(ProjectName).bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug Unicode|Win32"
- OutputDirectory="../../../Files/Debug/Plugins"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- 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/NewStatusNotify.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE"
/D "_CRT_NON_CONFORMING_SWPRINTFS""
- Optimization="0"
- InlineFunctionExpansion="0"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../include;../../ExternalAPI"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS"
- StringPooling="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- AssemblerListingLocation=""
- BrowseInformation="1"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib winmm.lib"
- Version=""
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- LinkTimeCodeGeneration="0"
- BaseAddress="0x25010000"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(IntDir)/$(TargetName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- OutputFile="$(IntDir)/$(ProjectName).bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath=".\indsnd.cpp"
- >
- </File>
- <File
- RelativePath=".\main.cpp"
- >
- <FileConfiguration
- Name="Release Unicode|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug Unicode|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\options.cpp"
- >
- </File>
- <File
- RelativePath=".\popup.cpp"
- >
- </File>
- <File
- RelativePath=".\utils.cpp"
- >
- </File>
- <File
- RelativePath=".\xstatus.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="common.h"
- >
- </File>
- <File
- RelativePath=".\indsnd.h"
- >
- </File>
- <File
- RelativePath=".\options.h"
- >
- </File>
- <File
- RelativePath=".\popup.h"
- >
- </File>
- <File
- RelativePath="resource.h"
- >
- </File>
- <File
- RelativePath=".\utils.h"
- >
- </File>
- <File
- RelativePath=".\version.h"
- >
- </File>
- <File
- RelativePath=".\xstatus.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- <File
- RelativePath=".\res\disable_all.ico"
- >
- </File>
- <File
- RelativePath=".\res\enable_all.ico"
- >
- </File>
- <File
- RelativePath=".\res\icon_small_dot.ico"
- >
- </File>
- <File
- RelativePath=".\res\logging.ico"
- >
- </File>
- <File
- RelativePath=".\res\main_off.ico"
- >
- </File>
- <File
- RelativePath=".\res\main_on.ico"
- >
- </File>
- <File
- RelativePath=".\res\popup.ico"
- >
- </File>
- <File
- RelativePath="resource.rc"
- >
- </File>
- <File
- RelativePath=".\res\sound.ico"
- >
- </File>
- <File
- RelativePath=".\version.rc"
- >
- </File>
- <File
- RelativePath=".\res\xstatus.ico"
- >
- </File>
- </Filter>
- <Filter
- Name="Docs"
- >
- <File
- RelativePath=".\docs\NewXstatusNotify_readme.txt"
- >
- </File>
- <File
- RelativePath=".\docs\NewXstatusNotify_translate.txt"
- >
- </File>
- <File
- RelativePath=".\docs\nsn_readme.txt"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/plugins/NewXstatusNotify/common.h b/plugins/NewXstatusNotify/common.h index 070bd2a15c..67892f1d72 100644 --- a/plugins/NewXstatusNotify/common.h +++ b/plugins/NewXstatusNotify/common.h @@ -92,15 +92,12 @@ #define GENDER_MALE 1
#define GENDER_FEMALE 2
-#define NOTIFY_INTERVAL_JABBER 2000
-#define NOTIFY_INTERVAL_ICQ 5000
-
#define ID_STATUS_FROMOFFLINE 1
#define ID_STATUS_EXTRASTATUS 40081
#define ID_STATUS_MIN ID_STATUS_OFFLINE
#define ID_STATUS_MAX ID_STATUS_OUTTOLUNCH
-#define ID_STATUS_MAX2 ID_STATUS_EXTRASTATUS
-#define STATUS_COUNT ID_STATUS_MAX2 - ID_STATUS_MIN + 1
+#define ID_STATUS_MAX2 ID_STATUS_EXTRASTATUS + 1
+#define STATUS_COUNT ID_STATUS_MAX2 - ID_STATUS_MIN
#define Index(ID_STATUS) ID_STATUS - ID_STATUS_OFFLINE
#define COLOR_BG_AVAILDEFAULT RGB(173,206,247)
@@ -137,6 +134,15 @@ typedef struct tagPLUGINDATA HANDLE hAwayMsgHook;
} PLUGINDATA;
+typedef struct {
+ HANDLE hContact;
+ TCHAR *cust;
+ TCHAR *oldstatusmsg;
+ TCHAR *newstatusmsg;
+ char *proto;
+ int compare;
+} STATUSMSGINFO;
+
/*
HANDLE hContact = (HANDLE)wParam;
WORD oldStatus = LOWORD(lParam);
@@ -149,4 +155,6 @@ Cast them to (int) if you need them that way. #define MS_STATUSCHANGE_MENUCOMMAND "NewStatusNotify/EnableDisableMenuCommand"
+#define TMR_CONNECTIONTIMEOUT 10000
+
#endif //COMMON_H
diff --git a/plugins/NewXstatusNotify/options.cpp b/plugins/NewXstatusNotify/options.cpp index 1c05e976a4..51cc48e432 100644 --- a/plugins/NewXstatusNotify/options.cpp +++ b/plugins/NewXstatusNotify/options.cpp @@ -29,7 +29,7 @@ OPTIONS opt = {0};
TEMPLATES templates = {0};
BOOL UpdateListFlag = FALSE;
-SortedList *ProtoTamplates;
+SortedList *ProtoTemplates;
int LastItem = 0;
extern HINSTANCE hInst;
@@ -114,13 +114,13 @@ void SaveTemplates() DBWriteContactSettingTString(0, MODULE, "TLogOpening", templates.LogOpening);
DBWriteContactSettingByte(0, MODULE, "TPopupFlags", templates.PopupFlags);
DBWriteContactSettingByte(0, MODULE, "TLogFlags", templates.LogFlags);
- for (int i = 0; i < ProtoTamplates->realCount; i++)
+ for (int i = 0; i < ProtoTemplates->realCount; i++)
{
- PROTOTAMPLATE *prototamplate = (PROTOTAMPLATE *)ProtoTamplates->items[i];
+ PROTOTEMPLATE *prototemplate = (PROTOTEMPLATE *)ProtoTemplates->items[i];
TCHAR str[MAX_PATH];
- mir_sntprintf(str, SIZEOF(str), _T("%s_TSMChange"), prototamplate->ProtoName);
+ mir_sntprintf(str, SIZEOF(str), _T("%s_TSMChange"), prototemplate->ProtoName);
char *szstr = mir_t2a(str);
- DBWriteContactSettingTString(0, MODULE, szstr, prototamplate->ProtoTamplate);
+ DBWriteContactSettingTString(0, MODULE, szstr, prototemplate->ProtoTemplate);
}
}
@@ -745,7 +745,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int count;
PROTOACCOUNT** protos;
ProtoEnumAccounts( &count, &protos );
- ProtoTamplates = li.List_Create(0, 10);
+ ProtoTemplates = li.List_Create(0, 10);
for(int i=0;i<count;i++) {
if ( !IsSuitableProto( protos[i] ))
@@ -754,8 +754,8 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA UpdateListFlag = TRUE;
lvItem.pszText = protos[i]->tszAccountName;
lvItem.lParam = (LPARAM)protos[i]->szModuleName;
- PROTOTAMPLATE *prototamplate = (PROTOTAMPLATE *)mir_alloc(sizeof(PROTOTAMPLATE));
- prototamplate->ProtoName = protos[i]->tszAccountName;
+ PROTOTEMPLATE *prototemplate = (PROTOTEMPLATE *)mir_alloc(sizeof(PROTOTEMPLATE));
+ prototemplate->ProtoName = protos[i]->tszAccountName;
TCHAR protoname[MAX_PATH] = {0};
mir_sntprintf(protoname, SIZEOF(protoname), _T("%s_TSMChange"), protos[i]->tszAccountName);
char *szprotoname = mir_t2a(protoname);
@@ -764,15 +764,15 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (lstrcmp(dbVar.ptszVal, NULL) == 0)
{
DBFreeVariant(&dbVar);
- _tcsncpy(prototamplate->ProtoTamplate, TranslateT(DEFAULT_POPUP_STATUSMESSAGE), SIZEOF(prototamplate->ProtoTamplate));
+ _tcsncpy(prototemplate->ProtoTemplate, TranslateT(DEFAULT_POPUP_STATUSMESSAGE), SIZEOF(prototemplate->ProtoTemplate));
}
else
{
- _tcsncpy(prototamplate->ProtoTamplate, dbVar.ptszVal, SIZEOF(prototamplate->ProtoTamplate));
+ _tcsncpy(prototemplate->ProtoTemplate, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplate));
}
mir_free(szprotoname);
ListView_InsertItem(hList,&lvItem);
- li.List_Insert(ProtoTamplates, prototamplate, ProtoTamplates->realCount);
+ li.List_Insert(ProtoTemplates, prototemplate, ProtoTemplates->realCount);
char dbSetting[128];
mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", protos[i]->szModuleName);
@@ -824,18 +824,18 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (nmlv->uNewState == 3 && !UpdateListFlag)
{
HWND hList = GetDlgItem(hwndDlg,IDC_PROTOCOLLIST);
- PROTOTAMPLATE *prototamplate;
+ PROTOTEMPLATE *prototemplate;
if (ListView_GetHotItem(hList) != ListView_GetSelectionMark(hList))
{
- prototamplate = (PROTOTAMPLATE *)ProtoTamplates->items[ListView_GetSelectionMark(hList)];
- GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototamplate->ProtoTamplate, MAX_PATH);
- li.List_Remove(ProtoTamplates, ListView_GetSelectionMark(hList));
- li.List_Insert(ProtoTamplates, prototamplate, ListView_GetSelectionMark(hList));
+ prototemplate = (PROTOTEMPLATE *)ProtoTemplates->items[ListView_GetSelectionMark(hList)];
+ GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate, MAX_PATH);
+ li.List_Remove(ProtoTemplates, ListView_GetSelectionMark(hList));
+ li.List_Insert(ProtoTemplates, prototemplate, ListView_GetSelectionMark(hList));
}
LastItem = ListView_GetHotItem(hList);
- prototamplate = (PROTOTAMPLATE *)ProtoTamplates->items[LastItem];
- SetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototamplate->ProtoTamplate);
+ prototemplate = (PROTOTEMPLATE *)ProtoTemplates->items[LastItem];
+ SetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate);
}
if ((nmlv->uNewState^nmlv->uOldState)&LVIS_STATEIMAGEMASK && !UpdateListFlag)
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -849,10 +849,10 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA opt.PopupOnConnect = IsDlgButtonChecked(hwndDlg, IDC_ONCONNECT);
// Templates
- PROTOTAMPLATE *prototamplate = (PROTOTAMPLATE *)ProtoTamplates->items[LastItem];
- GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototamplate->ProtoTamplate, MAX_PATH);
- li.List_Remove(ProtoTamplates, LastItem);
- li.List_Insert(ProtoTamplates, prototamplate, LastItem);
+ PROTOTEMPLATE *prototemplate = (PROTOTEMPLATE *)ProtoTemplates->items[LastItem];
+ GetDlgItemText(hwndDlg, IDC_POPUPTEXT, prototemplate->ProtoTemplate, MAX_PATH);
+ li.List_Remove(ProtoTemplates, LastItem);
+ li.List_Insert(ProtoTemplates, prototemplate, LastItem);
// Save options to db
SaveOptions();
@@ -876,7 +876,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA case WM_DESTROY:
{
- li.List_Destroy(ProtoTamplates);
+ li.List_Destroy(ProtoTemplates);
break;
}
diff --git a/plugins/NewXstatusNotify/xstatus.h b/plugins/NewXstatusNotify/xstatus.h index a26b5fbc60..d5a76acb52 100644 --- a/plugins/NewXstatusNotify/xstatus.h +++ b/plugins/NewXstatusNotify/xstatus.h @@ -90,11 +90,11 @@ typedef struct tagDBEVENT HANDLE hDBEvent;
} DBEVENT;
-typedef struct tagPROTOTAMPLATE
+typedef struct tagPROTOTEMPLATE
{
TCHAR *ProtoName;
- TCHAR ProtoTamplate[MAX_PATH];
-} PROTOTAMPLATE;
+ TCHAR ProtoTemplate[MAX_PATH];
+} PROTOTEMPLATE;
TCHAR *GetDefaultXstatusName(int statusID, char *szProto, TCHAR *buff, int bufflen);
XSTATUSCHANGE *NewXSC(HANDLE hContact, char *szProto, int xstatusType, int action, TCHAR *stzTitle, TCHAR *stzText);
|