From e7b69721b0d390cec3f81f97134a51bfef228cf8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 28 Mar 2018 20:01:30 +0300 Subject: PFLAG_UNIQUEIDSETTING removed, its functionality transferred to Proto_SetUniqueId / Proto_GetUniqueId --- protocols/Tox/src/stdafx.h | 29 ++++++++++++++--------------- protocols/Tox/src/tox_proto.cpp | 2 -- protocols/Tox/src/tox_proto.h | 4 +++- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index d6270b9373..aed6d505eb 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -45,21 +45,6 @@ struct CToxProto; #define now() time(nullptr) -#include "version.h" -#include "resource.h" -#include "tox_menus.h" -#include "tox_thread.h" -#include "tox_address.h" -#include "tox_dialogs.h" -#include "tox_profile.h" -#include "tox_options.h" -#include "tox_transfer.h" -#include "tox_proto.h" - -#include "http_request.h" - -extern HINSTANCE g_hInstance; - #define MODULE "Tox" #define TOX_ERROR -1 @@ -92,6 +77,20 @@ extern HINSTANCE g_hInstance; #define TOX_MAX_AVATAR_SIZE 1 << 16 // 2 ^ 16 bytes +#include "version.h" +#include "resource.h" +#include "tox_menus.h" +#include "tox_thread.h" +#include "tox_address.h" +#include "tox_dialogs.h" +#include "tox_profile.h" +#include "tox_options.h" +#include "tox_transfer.h" +#include "tox_proto.h" + +#include "http_request.h" + +extern HINSTANCE g_hInstance; extern HANDLE hProfileFolderPath; #endif //_COMMON_H_ \ No newline at end of file diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index 0de30278a4..f5a169797b 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -56,8 +56,6 @@ DWORD_PTR CToxProto::GetCaps(int type, MCONTACT) return PF4_SINGLEFILEONLY | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_FORCEADDED | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH; case PFLAG_UNIQUEIDTEXT: return (INT_PTR)"Tox ID"; - case PFLAG_UNIQUEIDSETTING: - return (DWORD_PTR)TOX_SETTINGS_ID; case PFLAG_MAXLENOFMESSAGE: return TOX_MAX_MESSAGE_LENGTH; } diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index ac71b30686..4b97cbad9a 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -251,7 +251,9 @@ struct CMPlugin : public ACCPROTOPLUGIN { CMPlugin() : ACCPROTOPLUGIN("TOX") - {} + { + SetUniqueId(TOX_SETTINGS_ID); + } }; #endif //_TOX_PROTO_H_ \ No newline at end of file -- cgit v1.2.3