From 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Dec 2019 16:08:03 +0300 Subject: GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName --- plugins/Clist_nicer/src/clc.cpp | 8 ++++---- plugins/Clist_nicer/src/clcitems.cpp | 6 +++--- plugins/Clist_nicer/src/clistevents.cpp | 2 +- plugins/Clist_nicer/src/clistmod.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 6 +++--- plugins/Clist_nicer/src/contact.cpp | 2 +- plugins/Clist_nicer/src/extBackg.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index ec0104e8ce..352d37898c 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -117,7 +117,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) else if (!__strcmp(cws->szSetting, "Timezone") || !__strcmp(cws->szSetting, "TzName")) ReloadExtraInfo(hContact); } - else if (hContact != 0 && (szProto = GetContactProto(hContact)) != nullptr) { + else if (hContact != 0 && (szProto = Proto_GetBaseAccountName(hContact)) != nullptr) { if (!__strcmp(cws->szModule, "Protocol") && !__strcmp(cws->szSetting, "p")) { char *szProto_s; Clist_Broadcast(INTM_PROTOCHANGED, hContact, lParam); @@ -312,7 +312,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L MCONTACT hSelItem = NULL; ClcContact *selcontact = nullptr; - char *szProto = GetContactProto(hContact); + char *szProto = Proto_GetBaseAccountName(hContact); if (szProto == nullptr) status = ID_STATUS_OFFLINE; else @@ -376,7 +376,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L if (contact->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) { contact->hSubContact = db_mc_getMostOnline(contact->hContact); - contact->metaProto = GetContactProto(contact->hSubContact); + contact->metaProto = Proto_GetBaseAccountName(contact->hSubContact); contact->iImage = Clist_GetContactIcon(contact->hSubContact); if (contact->pExtra) { TExtraCache *pSub = cfg::getCache(contact->hSubContact, contact->metaProto); @@ -488,7 +488,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L if (!Clist_FindItem(hwnd, dat, wParam, &contact)) break; - contact->pce->szProto = GetContactProto(wParam); + contact->pce->szProto = Proto_GetBaseAccountName(wParam); g_clistApi.pfnInvalidateDisplayNameCacheEntry(wParam); mir_wstrncpy(contact->szText, Clist_GetContactDisplayName(wParam), _countof(contact->szText)); diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 2586c4bf0d..9498dec0e5 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -105,7 +105,7 @@ ClcContact* AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hCo p->bIsMeta = FALSE; if (p->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) { p->hSubContact = db_mc_getMostOnline(hContact); - p->metaProto = GetContactProto(p->hSubContact); + p->metaProto = Proto_GetBaseAccountName(p->hSubContact); p->iImage = Clist_GetContactIcon(p->hSubContact); } else { @@ -166,7 +166,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto) p->bStatusMsgValid = STATUSMSG_CLIST; else { if (!szProto) - szProto = GetContactProto(hContact); + szProto = Proto_GetBaseAccountName(hContact); if (szProto) { if (!result) db_free(&dbv); @@ -383,7 +383,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData return dbHidden; if (szProto == nullptr) - szProto = GetContactProto(hContact); + szProto = Proto_GetBaseAccountName(hContact); // check stickies first (priority), only if we really have stickies defined (CLVM_STICKY_CONTACTS is set). if (cfg::dat.bFilterEffective & CLVM_STICKY_CONTACTS) { DWORD dwLocalMask = db_get_dw(hContact, "CLVM", cfg::dat.current_viewmode, 0); diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index ad9bd69be0..5bd2930d92 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -252,7 +252,7 @@ CListEvent* AddEvent(CLISTEVENT *cle) } } - char *szProto = GetContactProto(p->hContact); + char *szProto = Proto_GetBaseAccountName(p->hContact); wchar_t *szName = Clist_GetContactDisplayName(p->hContact); if (szProto && szName) { NotifyMenuItemExData *nmi = (NotifyMenuItemExData*)malloc(sizeof(NotifyMenuItemExData)); diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 73c10bbd16..a889752c3b 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -44,7 +44,7 @@ int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact) if (szProto != nullptr && !mir_strcmp(szProto, META_PROTO) && hContact != 0 && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) { MCONTACT hSubContact = db_mc_getMostOnline(hContact); - szFinalProto = GetContactProto(hSubContact); + szFinalProto = Proto_GetBaseAccountName(hSubContact); finalStatus = (status == 0) ? db_get_w(hSubContact, szFinalProto, "Status", ID_STATUS_OFFLINE) : status; hContact = hSubContact; } diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 544fe91482..f688fbf6db 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -400,7 +400,7 @@ void SetDBButtonStates(MCONTACT hPassedContact) continue; } if (buttonItem->dwFlags & BUTTON_ISCONTACTDBACTION) - szModule = GetContactProto(hContact); + szModule = Proto_GetBaseAccountName(hContact); hFinalContact = hContact; } else @@ -1348,7 +1348,7 @@ skipbg: } else if (item->dwFlags & BUTTON_ISPROTOSERVICE && cfg::clcdat) { if (contactOK) { - char *szProto = GetContactProto(hContact); + char *szProto = Proto_GetBaseAccountName(hContact); if (ProtoServiceExists(szProto, item->szService)) CallProtoService(szProto, item->szService, wwParam, llParam); else @@ -1364,7 +1364,7 @@ skipbg: if (item->dwFlags & BUTTON_ISCONTACTDBACTION || item->dwFlags & BUTTON_DBACTIONONCONTACT) { contactOK = ServiceParamsOK(item, &wwParam, &llParam, hContact); if (contactOK && item->dwFlags & BUTTON_ISCONTACTDBACTION) - szModule = GetContactProto(hContact); + szModule = Proto_GetBaseAccountName(hContact); finalhContact = hContact; } else diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index 055b63d012..fbe2680de5 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -44,7 +44,7 @@ static int GetContactStatus(MCONTACT hContact) { char *szProto; - szProto = GetContactProto(hContact); + szProto = Proto_GetBaseAccountName(hContact); if (szProto == nullptr) return ID_STATUS_OFFLINE; return db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE); diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 1ac9c420a8..ee38fcaafd 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1271,7 +1271,7 @@ void LoadPerContactSkins(wchar_t *tszFileName) if (items) { for (auto &hContact : Contacts()) { - char *szProto = GetContactProto(hContact); + char *szProto = Proto_GetBaseAccountName(hContact); if (szProto == nullptr) continue; -- cgit v1.2.3