19 files changed, 168 insertions, 1 deletions
diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 78cbb7e6fd..3bdaf6a035 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols\Teams\proto_teams\Proto_Teams.vcxproj", "{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -310,6 +312,14 @@ Global
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|Win32.Build.0 = Release|Win32
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.ActiveCfg = Release|x64
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.Build.0 = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin16/mir_icons.sln b/bin16/mir_icons.sln
index f5b98324bd..df811e7aa7 100644
--- a/bin16/mir_icons.sln
+++ b/bin16/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols\Teams\proto_teams\Proto_Teams.vcxproj", "{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -310,6 +312,14 @@ Global
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|Win32.Build.0 = Release|Win32
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.ActiveCfg = Release|x64
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.Build.0 = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin17/mir_icons.sln b/bin17/mir_icons.sln
index 0e4a0f0422..b36b8b2fce 100644
--- a/bin17/mir_icons.sln
+++ b/bin17/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols\Teams\proto_teams\Proto_Teams.vcxproj", "{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -310,6 +312,14 @@ Global
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|Win32.Build.0 = Release|Win32
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.ActiveCfg = Release|x64
 		{9C0BBF52-FE1D-4F07-9422-2B3321CFBE88}.Release|x64.Build.0 = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/protocols/ICQCorp/CMakeLists.txt b/protocols/ICQCorp/CMakeLists.txt
index 9e3d58ba26..d18898a34e 100644
--- a/protocols/ICQCorp/CMakeLists.txt
+++ b/protocols/ICQCorp/CMakeLists.txt
@@ -12,4 +12,5 @@ file(GLOB SOURCES "src/*.h" "res/*.rc"
 "src/user.cpp"
 )
 set(TARGET ICQCorp)
-include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
-\ No newline at end of file
+include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
+add_subdirectory(proto_icq)
diff --git a/protocols/ICQCorp/Proto_icq/CMakeLists.txt b/protocols/ICQCorp/Proto_icq/CMakeLists.txt
new file mode 100644
index 0000000000..596ac21624
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(TARGET Proto_ICQ)
+include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake)
+\ No newline at end of file
diff --git a/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj b/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj
new file mode 100644
index 0000000000..21763bbc0b
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Proto_ICQ</ProjectName>
+    <ProjectGuid>{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}</ProjectGuid>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj.filters b/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj.filters
new file mode 100644
index 0000000000..28f81e7f1b
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+</Project>
+\ No newline at end of file
diff --git a/protocols/ICQCorp/Proto_icq/res/Away.ico b/protocols/ICQCorp/Proto_icq/res/Away.ico
new file mode 100644
index 0000000000..248a3e9916
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Away.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/DND.ico b/protocols/ICQCorp/Proto_icq/res/DND.ico
new file mode 100644
index 0000000000..4833160eac
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/DND.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/FFC.ico b/protocols/ICQCorp/Proto_icq/res/FFC.ico
new file mode 100644
index 0000000000..e7ec4d3ae2
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/FFC.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Invisible.ico b/protocols/ICQCorp/Proto_icq/res/Invisible.ico
new file mode 100644
index 0000000000..6a337c2926
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Invisible.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/NA.ico b/protocols/ICQCorp/Proto_icq/res/NA.ico
new file mode 100644
index 0000000000..ec0621dc9f
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/NA.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Occupied.ico b/protocols/ICQCorp/Proto_icq/res/Occupied.ico
new file mode 100644
index 0000000000..04ea2a5855
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Occupied.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Offline.ico b/protocols/ICQCorp/Proto_icq/res/Offline.ico
new file mode 100644
index 0000000000..af862168cd
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Offline.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Online.ico b/protocols/ICQCorp/Proto_icq/res/Online.ico
new file mode 100644
index 0000000000..2e33305a76
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Online.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Phone.ico b/protocols/ICQCorp/Proto_icq/res/Phone.ico
new file mode 100644
index 0000000000..74c80b66ed
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Phone.ico
diff --git a/protocols/ICQCorp/Proto_icq/res/Proto_ICQ.rc b/protocols/ICQCorp/Proto_icq/res/Proto_ICQ.rc
new file mode 100644
index 0000000000..33d8faf243
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/res/Proto_ICQ.rc
@@ -0,0 +1,77 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Russian (Russia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "Offline.ico"
+IDI_ICON2               ICON                    "Online.ico"
+IDI_ICON3               ICON                    "Away.ico"
+IDI_ICON4               ICON                    "Invisible.ico"
+IDI_ICON5               ICON                    "NA.ico"
+IDI_ICON6               ICON                    "DND.ico"
+IDI_ICON7               ICON                    "Occupied.ico"
+IDI_ICON8               ICON                    "FFC.ico"
+IDI_ICON9               ICON                    "Phone.ico"
+#endif    // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/protocols/ICQCorp/Proto_icq/src/resource.h b/protocols/ICQCorp/Proto_icq/src/resource.h
new file mode 100644
index 0000000000..c74e04f59e
--- /dev/null
+++ b/protocols/ICQCorp/Proto_icq/src/resource.h
@@ -0,0 +1,24 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Proto_ICQ.rc
+//
+#define IDI_ICON1                       105
+#define IDI_ICON2                       104
+#define IDI_ICON3                       128
+#define IDI_ICON4                       130
+#define IDI_ICON5                       131
+#define IDI_ICON6                       158
+#define IDI_ICON7                       159
+#define IDI_ICON8                       129
+#define IDI_ICON9                       1002
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        110
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 1d142092a1..a5f15f5ae8 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -54,6 +54,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="FTPFile.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\libcurl.mir" "Libs\libssh2.mir")
 	if /I "%%a"=="GG.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_GG.dll")
 	if /I "%%a"=="HistoryPP.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\HistoryPP_icons.dll")
+	if /I "%%a"=="ICQCorp.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_ICQ.dll")
 	if /I "%%a"=="IRC.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_IRC.dll")
 	if /I "%%a"=="Import.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Plugins\Import\*.ini")
 	if /I "%%a"=="Jabber.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Jabber.dll" "Icons\xStatus_Jabber.dll" "Libs\libsignal.mir")