diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-19 14:34:58 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-19 14:34:58 +0300 |
| commit | 8bab65e5e51df9f5c70f9fd6d7e3fdb0771c37e9 (patch) | |
| tree | ccde89c016d5b2f9e5b4902c7d500e7a11ceeb1c /protocols/JabberG | |
| parent | 9d2d33690533c01af99a1f22d019e55134b48ab5 (diff) | |
fixes #4055 completely
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 6 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_userinfo.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_vcard.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 90e6031efa..e41da8181e 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -1105,9 +1105,9 @@ void CJabberProto::OnIqResultGetVcard(const TiXmlElement *iqNode, CJabberIqInfo* ResolveTransportNicks((p != nullptr) ? p + 1 : jid);
}
else {
- if (hContact != 0)
- ProtoBroadcastAck(hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1);
- else {
+ ProtoBroadcastAck(hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1);
+
+ if (hContact == 0) {
CMStringA oldHash(getMStringA("VCardHash"));
if (oldHash != szNodeHash) {
setString("VCardHash", szNodeHash);
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index d2f11f2fa3..d606c55d4b 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -963,9 +963,9 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) if (szProto != nullptr && !mir_strcmp(szProto, m_szModuleName)) {
USERINFOPAGE uip = {};
uip.dwInitParam = (LPARAM)this;
- uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_ICON;
+ uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB;
uip.szGroup.w = m_tszUserName;
- uip.dwInitParam = (LPARAM)Skin_GetProtoIcon(m_szModuleName, ID_STATUS_ONLINE);
+ uip.szProto = m_szModuleName;
uip.pDialog = new JabberUserInfoDlg(this);
uip.position = -2000000000;
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 2ac2c8af6b..4e510462cd 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -1033,9 +1033,9 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM) m_szPhotoFileName[0] = 0;
USERINFOPAGE uip = {};
- uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_ICON;
+ uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB;
uip.szGroup.w = m_tszUserName;
- uip.dwInitParam = (LPARAM)Skin_GetProtoIcon(m_szModuleName, ID_STATUS_ONLINE);
+ uip.szProto = m_szModuleName;
uip.pDialog = new JabberVcardPersonalDlg(this);
uip.szTitle.w = LPGENW("General");
|