diff options
Diffstat (limited to 'protocols/ICQCorp')
18 files changed, 148 insertions, 6 deletions
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..0e3304a87c --- /dev/null +++ b/protocols/ICQCorp/Proto_icq/Proto_ICQ.vcxproj @@ -0,0 +1,34 @@ +<?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> + <ItemGroup> + <ClInclude Include="src\resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="res\Proto_ICQ.rc" /> + </ItemGroup> +</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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp index 576bf6eb76..25fa81c8f2 100644 --- a/protocols/ICQCorp/src/protocol.cpp +++ b/protocols/ICQCorp/src/protocol.cpp @@ -1985,7 +1985,7 @@ void ICQ::addMessage(ICQUser *u, char *m, time_t t) Netlib_Logf(hNetlibUser, "message: %s\n", m);
DB::EventInfo dbei;
- dbei.timestamp = t;
+ dbei.iTimestamp = t;
dbei.pBlob = m;
ProtoChainRecvMsg(u->hContact, dbei);
}
@@ -1997,7 +1997,7 @@ void ICQ::addAwayMsg(ICQUser *u, char *m, unsigned long theSequence, time_t t) Netlib_Logf(hNetlibUser, "away msg: %s\n", m);
DB::EventInfo dbei;
- dbei.timestamp = t;
+ dbei.iTimestamp = t;
dbei.pBlob = m;
dbei.cbBlob = theSequence;
@@ -2019,7 +2019,7 @@ void ICQ::addFileReq(ICQUser *u, char *m, char *filename, unsigned long size, un DB::FILE_BLOB blob(transfer, filename, m);
DB::EventInfo dbei;
- dbei.timestamp = t;
+ dbei.iTimestamp = t;
blob.write(dbei);
CCSDATA ccs = { u->hContact, PSR_FILE, 0, (LPARAM)&dbei };
diff --git a/protocols/ICQCorp/src/stdafx.cxx b/protocols/ICQCorp/src/stdafx.cxx index 38d137df79..fa49c1adb3 100644 --- a/protocols/ICQCorp/src/stdafx.cxx +++ b/protocols/ICQCorp/src/stdafx.cxx @@ -1,5 +1,5 @@ /*
-Copyright (c) 2014-24 Miranda NG team (https://miranda-ng.org)
+Copyright (c) 2014-25 Miranda NG team (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/ICQCorp/src/version.h b/protocols/ICQCorp/src/version.h index 0ac71978a9..30accda88b 100644 --- a/protocols/ICQCorp/src/version.h +++ b/protocols/ICQCorp/src/version.h @@ -10,4 +10,4 @@ #define __DESCRIPTION "ICQ corporate protocol support for Miranda NG."
#define __AUTHOR "Miranda NG team, Eugene Tarasenko"
#define __AUTHORWEB "https://miranda-ng.org/p/ICQCorp"
-#define __COPYRIGHT "© 2014-24 Miranda NG team, 2003-2005 Eugene Tarasenko"
+#define __COPYRIGHT "© 2014-25 Miranda NG team, 2003-2005 Eugene Tarasenko"
|