From b7a1174511c3b7fad5b81a54bb4647662d94031c Mon Sep 17 00:00:00 2001 From: Piotr Piastucki Date: Thu, 14 May 2015 15:24:53 +0000 Subject: Updated for partial MSNP24 protocol support, for detailed changes see MSNP24 branch. git-svn-id: http://svn.miranda-ng.org/main/trunk@13589 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_svcs.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'protocols/MSN/src/msn_svcs.cpp') diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index 61161e0ea2..864a3770d1 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -71,8 +71,10 @@ INT_PTR CMsnProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam) cont = Lists_Get(AI->hContact); if (cont == NULL) return GAIR_NOAVATAR; + /* if ((cont->cap1 & 0xf0000000) == 0) return GAIR_NOAVATAR; + */ } if (AI->hContact == NULL || _stricmp(cont->email, MyOptions.szEmail) == 0) { @@ -454,7 +456,8 @@ int CMsnProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam) if (!strcmp(cws->szSetting, "ApparentMode")) { char tEmail[MSN_MAX_EMAIL_LEN]; - if (!db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail))) { + if (!db_get_static(hContact, m_szModuleName, "wlid", tEmail, sizeof(tEmail)) || + !db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail))) { bool isBlocked = Lists_IsInList(LIST_BL, tEmail); if (isBlocked && (cws->value.type == DBVT_DELETED || cws->value.wVal == 0)) { -- cgit v1.2.3