From 426e2f9755a14023223e2e3ebfa8e78f6e8677a8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 27 Sep 2019 21:32:12 +0300 Subject: fix for a function name: Clist_IsHidden => Contact_IsHidden Clist_HideContact => Contact_Hide --- plugins/AVS/src/options.cpp | 12 ++++++------ plugins/AVS/src/stdafx.h | 1 + plugins/AVS/src/utils.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/AVS/src') diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 93ef446f50..a16c83a7fa 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -496,7 +496,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA ShowWindow(hwndDlg, SW_SHOWNORMAL); InvalidateRect(GetDlgItem(hwndDlg, IDC_PROTOPIC), nullptr, FALSE); CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Clist_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Contact_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS), 0); SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETRANGE, 0, MAKELONG(8, 2)); @@ -528,8 +528,8 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA bool locked = IsDlgButtonChecked(hwndDlg, IDC_PROTECTAVATAR) != 0; bool hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) != 0; SetAvatarAttribute(hContact, AVS_HIDEONCLIST, hidden); - if (hidden != Clist_IsHidden(hContact)) - Clist_HideContact(hContact, hidden); + if (hidden != Contact_IsHidden(hContact)) + Contact_Hide(hContact, hidden); if (!locked && db_get_b(hContact, "ContactPhoto", "NeedUpdate", 0)) QueueAdd(hContact); @@ -750,7 +750,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa TranslateDialogDefault(hwndDlg); SendMessage(hwndDlg, DM_SETAVATARNAME, 0, 0); CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Clist_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Contact_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS), 0); SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETRANGE, 0, MAKELONG(8, 2)); @@ -785,8 +785,8 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa { bool hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) != 0; SetAvatarAttribute(hContact, AVS_HIDEONCLIST, hidden); - if (hidden != Clist_IsHidden(hContact)) - Clist_HideContact(hContact, hidden); + if (hidden != Contact_IsHidden(hContact)) + Contact_Hide(hContact, hidden); } break; diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index c1084192f4..fe61d19107 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include #include #include diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index 80b8add728..53a9d7e651 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -158,7 +158,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz GetObject(ace->hbmPic, sizeof(bminfo), &bminfo); ace->dwFlags = AVS_BITMAP_VALID; - if (hContact != NULL && Clist_IsHidden(hContact)) + if (hContact != NULL && Contact_IsHidden(hContact)) ace->dwFlags |= AVS_HIDEONCLIST; ace->hContact = hContact; ace->bmHeight = bminfo.bmHeight; -- cgit v1.2.3