diff options
Diffstat (limited to 'plugins/MirOTR/src')
| -rw-r--r-- | plugins/MirOTR/src/dbfilter.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirOTR/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirOTR/src/svcs_menu.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirOTR/src/svcs_srmm.cpp | 6 | ||||
| -rw-r--r-- | plugins/MirOTR/src/utils.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp index 09ca8e241d..ef9d7d0d93 100644 --- a/plugins/MirOTR/src/dbfilter.cpp +++ b/plugins/MirOTR/src/dbfilter.cpp @@ -57,7 +57,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) const char *proto = Proto_GetBaseAccountName(hContact); if (!proto) return 0; - if (Contact_IsGroupChat(hContact, proto)) + if (Contact::IsGroupChat(hContact, proto)) return 0; if (mir_strcmp(proto, META_PROTO) == 0) { diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp index 8c607cd386..9c557c2266 100644 --- a/plugins/MirOTR/src/options.cpp +++ b/plugins/MirOTR/src/options.cpp @@ -523,7 +523,7 @@ class CContactOptionsDlg : public CDlgBase for (auto &hContact : Contacts()) { const char *proto = Proto_GetBaseAccountName(hContact); - if (proto && !Contact_IsGroupChat(hContact, proto) // ignore chatrooms + if (proto && !Contact::IsGroupChat(hContact, proto) // ignore chatrooms && Proto_IsProtoOnContact(hContact, MODULENAME) && mir_strcmp(proto, META_PROTO) != 0) // and MetaContacts { diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp index 38a1129079..dcc7eb6fdd 100644 --- a/plugins/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/src/svcs_menu.cpp @@ -184,7 +184,7 @@ int SVC_PrebuildContactMenu(WPARAM hContact, LPARAM) Menu_ShowItem(hStopItem, false); const char *proto = Proto_GetBaseAccountName(hContact); - if (!proto || Contact_IsGroupChat(hContact, proto)) + if (!proto || Contact::IsGroupChat(hContact, proto)) return 0; if (proto && mir_strcmp(proto, META_PROTO) == 0) { diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp index 06d5cdae56..f3aa6d6f98 100644 --- a/plugins/MirOTR/src/svcs_srmm.cpp +++ b/plugins/MirOTR/src/svcs_srmm.cpp @@ -8,7 +8,7 @@ int SVC_IconPressed(WPARAM hContact, LPARAM lParam) StatusIconClickData *sicd = (StatusIconClickData *)lParam; if (mir_strcmp(sicd->szModule, MODULENAME) == 0) { - if (!Contact_IsGroupChat(hContact)) + if (!Contact::IsGroupChat(hContact)) ShowOTRMenu(hContact, sicd->clickLocation); } @@ -18,7 +18,7 @@ int SVC_IconPressed(WPARAM hContact, LPARAM lParam) // set SRMM icon status, if applicable void SetEncryptionStatus(MCONTACT hContact, TrustLevel level) { - bool chat_room = Contact_IsGroupChat(hContact); + bool chat_room = Contact::IsGroupChat(hContact); BBButton button = OTRButton; int flags1 = MBF_HIDDEN, flags2 = MBF_HIDDEN; @@ -85,7 +85,7 @@ int SVC_ButtonsBarPressed(WPARAM w, LPARAM l) if (cbcd->dwButtonId == 0 && !mir_strcmp(cbcd->pszModule, MODULENAME)) { MCONTACT hContact = (MCONTACT)w; - if (!Contact_IsGroupChat(hContact)) + if (!Contact::IsGroupChat(hContact)) ShowOTRMenu(hContact, cbcd->pt); } diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index 1b1a9fe55c..186a37364f 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -88,7 +88,7 @@ void otrl_privkey_hash_to_humanT(wchar_t human[45], const unsigned char hash[20] char* contact_get_id(MCONTACT hContact) { - ptrW pszUniqueID(Contact_GetInfo(CNF_UNIQUEID, hContact)); + ptrW pszUniqueID(Contact::GetInfo(CNF_UNIQUEID, hContact)); if (!pszUniqueID) pszUniqueID = mir_wstrdup(Clist_GetContactDisplayName(hContact)); @@ -110,7 +110,7 @@ char* GetDlgItemTextUtf(HWND hwndDlg, int ctrlId) wchar_t* ProtoGetNickname(const char* proto) { - wchar_t *p = Contact_GetInfo(CNF_NICK, NULL, proto); + wchar_t *p = Contact::GetInfo(CNF_NICK, NULL, proto); return (p != nullptr) ? p : mir_wstrdup(L""); } |