diff options
| author | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
| commit | 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 (patch) | |
| tree | 59dbb53fc9496d660ec2ef2846a4eab0f1720b88 /protocols/Gadu-Gadu/src | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'protocols/Gadu-Gadu/src')
| -rw-r--r-- | protocols/Gadu-Gadu/src/dialogs.cpp | 4 | ||||
| -rw-r--r-- | protocols/Gadu-Gadu/src/groupchat.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 4302ba3cbd..e9bbc23395 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -538,7 +538,7 @@ static INT_PTR CALLBACK gg_detailsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, break; } - char *szProto = (hContact == NULL) ? gg->m_szModuleName : GetContactProto(hContact); + char *szProto = (hContact == NULL) ? gg->m_szModuleName : Proto_GetBaseAccountName(hContact); if (szProto == nullptr) break; @@ -735,7 +735,7 @@ int GaduProto::details_init(WPARAM wParam, LPARAM hContact) } else { // Other user details - char* szProto = GetContactProto(hContact); + char* szProto = Proto_GetBaseAccountName(hContact); if (szProto == nullptr) return 0; if (mir_strcmp(szProto, m_szModuleName) || isChatRoom(hContact)) diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 693216babe..63a2547cf7 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -375,12 +375,12 @@ wchar_t* GaduProto::gc_getchat(uin_t sender, uin_t *recipients, int recipients_c static MCONTACT gg_getsubcontact(GaduProto* gg, MCONTACT hContact)
{
- char* szProto = GetContactProto(hContact);
+ char* szProto = Proto_GetBaseAccountName(hContact);
if (szProto && !mir_strcmp(szProto, META_PROTO)) {
int nSubContacts = db_mc_getSubCount(hContact), i;
for (i = 0; i < nSubContacts; i++) {
MCONTACT hMetaContact = db_mc_getSub(hContact, i);
- szProto = GetContactProto(hMetaContact);
+ szProto = Proto_GetBaseAccountName(hMetaContact);
if (szProto && !mir_strcmp(szProto, gg->m_szModuleName))
return hMetaContact;
}
@@ -496,7 +496,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa uin = (uin_t)gg->getDword(hMetaContact, GG_KEY_UIN, 0);
}
else {
- szProto = GetContactProto(hContact);
+ szProto = Proto_GetBaseAccountName(hContact);
uin = (uin_t)gg->getDword(hContact, GG_KEY_UIN, 0);
}
|