diff options
author | George Hazan <george.hazan@gmail.com> | 2013-09-20 19:31:57 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-09-20 19:31:57 +0000 |
commit | 14877a748010cf73448cc6892792120e4b191439 (patch) | |
tree | 0f433ab5b6daaed39e42265227c35dc951558d8b /protocols/JabberG/src/jabber_proto.cpp | |
parent | 6a7f572f84f3f23b55ab0f42c1203035463c38d8 (diff) |
Jabber:
- JABBER_RESOURCE_STATUS became a class;
- static item JABBER_LIST_ITEM::itemResource converted into a dynamically allocated structure for resourceless items only;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@6144 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 047e8f3da6..784ce86e82 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -761,7 +761,7 @@ int __cdecl CJabberProto::GetInfo(HANDLE hContact, int /*infoType*/) }
}
}
- else if ( !item->itemResource.dwVersionRequestTime) {
+ else if ( !item->m_pItemResource->dwVersionRequestTime) {
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,8 @@ void __cdecl CJabberProto::GetAwayMsgThread(void* hContact) return;
}
- if (item->itemResource.statusMessage != NULL) {
- ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)item->itemResource.statusMessage);
+ if (item->m_pItemResource->statusMessage != NULL) {
+ ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)item->m_pItemResource->statusMessage);
return;
}
}
|