diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-23 08:08:32 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-23 08:08:32 +0000 |
| commit | 83181e39a7613a9ed00c6c7ddcbea59a340d491e (patch) | |
| tree | 875f2c835adb77d2bd27d6a8566c005bc7507e2e /protocols/JabberG/src/jabber_proto.cpp | |
| parent | 4d048a498cfaf2eff47167714d37e11f451135de (diff) | |
automatic allocator for a temp resource item
git-svn-id: http://svn.miranda-ng.org/main/trunk@6192 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 55fd4c8e7d..14aaaae002 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -753,14 +753,14 @@ int __cdecl CJabberProto::GetInfo(HANDLE hContact, int /*infoType*/) m_ThreadInfo->send(iq5);
}
- if ( !r->m_dwVersionRequestTime) {
+ if (r->m_dwVersionRequestTime == 0) {
XmlNodeIq iq4(m_iqManager.AddHandler(&CJabberProto::OnIqResultVersion, JABBER_IQ_TYPE_GET, tmp, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_HCONTACT | JABBER_IQ_PARSE_CHILD_TAG_NODE));
iq4 << XQUERY(JABBER_FEAT_VERSION);
m_ThreadInfo->send(iq4);
}
}
}
- else if (item->m_pItemResource && item->m_pItemResource->m_dwVersionRequestTime == 0) {
+ else if (item->getTemp()->m_dwVersionRequestTime == 0) {
XmlNodeIq iq4(m_iqManager.AddHandler(&CJabberProto::OnIqResultVersion, JABBER_IQ_TYPE_GET, item->jid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_HCONTACT | JABBER_IQ_PARSE_CHILD_TAG_NODE));
iq4 << XQUERY(JABBER_FEAT_VERSION);
m_ThreadInfo->send(iq4);
@@ -1337,8 +1337,9 @@ void __cdecl CJabberProto::GetAwayMsgThread(void* hContact) return;
}
- if (item->m_pItemResource->m_tszStatusMessage != NULL) {
- ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)item->m_pItemResource->m_tszStatusMessage);
+ TCHAR *tszStatusMsg = item->getTemp()->m_tszStatusMessage;
+ if (tszStatusMsg != NULL) {
+ ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)tszStatusMsg);
return;
}
}
|