diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-06-22 15:38:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-06-22 15:38:30 +0000 |
| commit | 937c816460e09bf4da2d4fbf6ca5c4b18346ee19 (patch) | |
| tree | faf03f55fc08cfa08a281b858d2cdd75d5058dfd /protocols/JabberG | |
| parent | 296c88217ab4b2872d8fdada5e8c309dcb50bf24 (diff) | |
- fix a bug with roster push processing in Jabber;
- cosmetic fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@17016 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_iq_handlers.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 2 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_util.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index 13e3cc5cca..40e3ac164e 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -254,7 +254,7 @@ BOOL CJabberProto::OnRosterPushRequest(HXML, CJabberIqInfo *pInfo) if (nick != NULL) {
MCONTACT hContact = HContactFromJID(jid, false);
if (hContact == NULL)
- hContact = DBCreateContact(jid, nick, false, false);
+ hContact = DBCreateContact(jid, nick, false, true);
else
setTString(hContact, "jid", jid);
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index fdba87e6cf..32bf643dac 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -402,7 +402,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) MCONTACT hContact = HContactFromJID(jid);
if (hContact == NULL) // Received roster has a new JID.
- hContact = DBCreateContact(jid, nick, false, false); // Add the jid (with empty resource) to Miranda contact list.
+ hContact = DBCreateContact(jid, nick, false, true); // Add the jid (with empty resource) to Miranda contact list.
JABBER_LIST_ITEM *item = ListAdd(LIST_ROSTER, jid, hContact);
item->subscription = sub;
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 64d43d4404..ed9cc47d71 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1512,14 +1512,14 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData *info) }
MCONTACT hContact;
- BOOL bSelfPresence = FALSE;
+ bool bSelfPresence = false;
TCHAR szBareFrom[JABBER_MAX_JID_LEN];
JabberStripJid(from, szBareFrom, _countof(szBareFrom));
TCHAR szBareOurJid[JABBER_MAX_JID_LEN];
JabberStripJid(info->fullJID, szBareOurJid, _countof(szBareOurJid));
if (!mir_tstrcmpi(szBareFrom, szBareOurJid))
- bSelfPresence = TRUE;
+ bSelfPresence = true;
LPCTSTR type = XmlGetAttrValue(node, _T("type"));
if (type == NULL || !mir_tstrcmp(type, _T("available"))) {
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index ad0e2caf07..8b1f200a44 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -58,7 +58,7 @@ MCONTACT CJabberProto::HContactFromJID(const TCHAR *jid, bool bStripResource) if (bStripResource) {
TCHAR szJid[JABBER_MAX_JID_LEN];
JabberStripJid(jid, szJid, _countof(szJid));
- item = ListGetItemPtr(LIST_ROSTER, jid);
+ item = ListGetItemPtr(LIST_ROSTER, szJid);
if (item != NULL && item->hContact)
return item->hContact;
}
|