diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Gadu-Gadu/src/userinfo.cpp | 4 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/userinfo.cpp | 4 | ||||
| -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 |
5 files changed, 11 insertions, 11 deletions
diff --git a/protocols/Gadu-Gadu/src/userinfo.cpp b/protocols/Gadu-Gadu/src/userinfo.cpp index 92c031e12b..0fa91a5c99 100644 --- a/protocols/Gadu-Gadu/src/userinfo.cpp +++ b/protocols/Gadu-Gadu/src/userinfo.cpp @@ -313,11 +313,11 @@ int GaduProto::details_init(WPARAM wParam, LPARAM hContact) }
USERINFOPAGE uip = {};
- uip.flags = ODPF_DONTTRANSLATE | ODPF_UNICODE | ODPF_ICON;
+ uip.flags = ODPF_DONTTRANSLATE | ODPF_UNICODE;
uip.position = -1900000000;
uip.pDialog = new GaduUserInfoDlg(this, idDialog);
uip.szTitle.w = m_tszUserName;
- uip.dwInitParam = LPARAM(g_plugin.getIconHandle(IDI_GG));
+ uip.szProto = m_szModuleName;
g_plugin.addUserInfo(wParam, &uip);
// Start search for user data
diff --git a/protocols/ICQ-WIM/src/userinfo.cpp b/protocols/ICQ-WIM/src/userinfo.cpp index b909c2ea5e..fd4349b852 100644 --- a/protocols/ICQ-WIM/src/userinfo.cpp +++ b/protocols/ICQ-WIM/src/userinfo.cpp @@ -83,10 +83,10 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) return 0;
USERINFOPAGE uip = {};
- uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE | ODPF_ICON;
- uip.dwInitParam = (LPARAM)Skin_GetProtoIcon(m_szModuleName, ID_STATUS_ONLINE);
+ uip.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE;
uip.szTitle.w = L"ICQ";
uip.szGroup.w = m_tszUserName;
+ uip.szProto = m_szModuleName;
uip.position = -1900000000;
uip.pDialog = new IcqUserInfoDlg(this);
g_plugin.addUserInfo(wParam, &uip);
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");
|