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 /plugins/FavContacts | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'plugins/FavContacts')
| -rw-r--r-- | plugins/FavContacts/src/favlist.h | 2 | ||||
| -rw-r--r-- | plugins/FavContacts/src/http_api.cpp | 2 | ||||
| -rw-r--r-- | plugins/FavContacts/src/menu.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
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);
|