From 0fa39189ae1eea51681d472db38a290bc4df1cfe Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 24 Jan 2024 13:38:10 +0300 Subject: PS_GETNAME: another old atavism removed --- plugins/Variables/src/contact.cpp | 7 ------- plugins/Variables/src/contact.h | 8 +++----- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'plugins/Variables/src') diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index 2d5e1fca0d..399d2d6dcc 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -65,7 +65,6 @@ static builtinCnfs[] = { CNF_COHOMEPAGE, STR_COHOMEPAGE }, { CCNF_ACCOUNT, STR_ACCOUNT }, - { CCNF_PROTOCOL, STR_PROTOCOL }, { CCNF_STATUS, STR_STATUS }, { CCNF_INTERNALIP, STR_INTERNALIP }, { CCNF_EXTERNALIP, STR_EXTERNALIP }, @@ -128,12 +127,6 @@ wchar_t* getContactInfoT(uint8_t type, MCONTACT hContact) return pa ? mir_wstrdup(pa->tszAccountName) : nullptr; } - case CCNF_PROTOCOL: - char protoname[128]; - if (CallProtoService(szProto, PS_GETNAME, (WPARAM)sizeof(protoname), (LPARAM)protoname)) - return nullptr; - return mir_a2u(protoname); - case CCNF_STATUS: return mir_wstrdup(Clist_GetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0)); diff --git a/plugins/Variables/src/contact.h b/plugins/Variables/src/contact.h index f8d04de21d..da81160e95 100644 --- a/plugins/Variables/src/contact.h +++ b/plugins/Variables/src/contact.h @@ -59,18 +59,16 @@ #define STR_COHOMEPAGE L"cohomepage" #define STR_ACCOUNT L"account" -#define STR_PROTOCOL L"protocol" #define STR_STATUS L"status" #define STR_INTERNALIP L"intip" #define STR_EXTERNALIP L"extip" #define STR_GROUP L"group" #define STR_PROTOID L"protoid" -#define CCNF_ACCOUNT 51 // CUSTOM, returns contact's account name (0.8.0+) -#define CCNF_PROTOCOL 50 // CUSTOM, returns the contact's protocol (human-readable) +#define CCNF_ACCOUNT 50 // CUSTOM, returns contact's account name (0.8.0+) #define CCNF_STATUS 49 // CUSTOM, returns status mode description -#define CCNF_INTERNALIP 48 // CUSTOM, returns the contact's internal IP -#define CCNF_EXTERNALIP 47 // CUSTOM, returns the contact's external IP +#define CCNF_INTERNALIP 48 // CUSTOM, returns the contact's internal IP +#define CCNF_EXTERNALIP 47 // CUSTOM, returns the contact's external IP #define CCNF_GROUP 46 // CUSTOM, returns group name #define CCNF_PROTOID 45 // CUSTOM, returns protocol ID instead of name -- cgit v1.2.3