diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-03 09:31:41 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-03 09:31:41 +0000 |
| commit | 9257dc8641a40437ceda38b65f4be7390e57954b (patch) | |
| tree | 58db95265b11b52a59142db2ede15f9f22a6c76b /protocols/JabberG/src/jabber_svc.cpp | |
| parent | 5bc3f00e4f75370e923b2c49994ac0ea3280397a (diff) | |
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@6318 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_svc.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index cbbc811759..e8f13708a3 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -159,12 +159,9 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam) Log("Rereading %s for %S", isXVcard ? JABBER_FEAT_VCARD_TEMP : JABBER_FEAT_AVATAR, szJid);
- HXML iq;
- if (isXVcard)
- iq = XmlNodeIq( AddIQ(&CJabberProto::OnIqResultGetVCardAvatar, JABBER_IQ_TYPE_GET, szJid)) << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP);
- else
- iq = XmlNodeIq( AddIQ(&CJabberProto::OnIqResultGetClientAvatar, JABBER_IQ_TYPE_GET, szJid)) << XQUERY(JABBER_FEAT_AVATAR);
- m_ThreadInfo->send(iq);
+ m_ThreadInfo->send((isXVcard) ?
+ XmlNodeIq( AddIQ(&CJabberProto::OnIqResultGetVCardAvatar, JABBER_IQ_TYPE_GET, szJid)) << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP) :
+ XmlNodeIq( AddIQ(&CJabberProto::OnIqResultGetClientAvatar, JABBER_IQ_TYPE_GET, szJid)) << XQUERY(JABBER_FEAT_AVATAR));
db_free(&dbv);
return GAIR_WAITFOR;
|