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/FavContacts/src/favlist.h | 2 +- plugins/FavContacts/src/http_api.cpp | 2 +- plugins/FavContacts/src/menu.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/FavContacts') diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h index 3bf8899ffc..eeaea0d6ea 100644 --- a/plugins/FavContacts/src/favlist.h +++ b/plugins/FavContacts/src/favlist.h @@ -24,7 +24,7 @@ public: else group = mir_wstrdup(TranslateT("Favorite Contacts")); - status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); + status = db_get_w(hContact, Proto_GetBaseAccountName(hContact), "Status", ID_STATUS_OFFLINE); } ~TContactInfo() diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp index c3c97ca5b5..eb4ca9140e 100644 --- a/plugins/FavContacts/src/http_api.cpp +++ b/plugins/FavContacts/src/http_api.cpp @@ -76,7 +76,7 @@ public: MCONTACT hContact = favList[i]->getHandle(); wchar_t *name = Clist_GetContactDisplayName(hContact); AVATARCACHEENTRY *avatar = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, hContact, 0); - int status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); + int status = db_get_w(hContact, Proto_GetBaseAccountName(hContact), "Status", ID_STATUS_OFFLINE); Send("SetContact("); Send(i); diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 086d303557..de3817148a 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -73,7 +73,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options) bool bFree = false; wchar_t *title = db_get_wsa(hContact, "CList", "StatusMsg"); if (title == nullptr) { - char *proto = GetContactProto(hContact); + char *proto = Proto_GetBaseAccountName(hContact); int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE); title = Clist_GetStatusModeDescription(status, 0); } @@ -239,7 +239,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = nullp lpdis->rcItem.top += 2; lpdis->rcItem.bottom -= 2; - char *proto = GetContactProto(hContact); + char *proto = Proto_GetBaseAccountName(hContact); HIMAGELIST hIml = Clist_GetImageList(); int iIcon = Clist_GetContactIcon(hContact); -- cgit v1.2.3