diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-20 14:23:07 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 14:23:07 +0000 |
| commit | 5e4286f1becfb5ce52372f882a51ae8ea6f6ef6d (patch) | |
| tree | 60e5dc3d3fa347ba34e1447e6b6e925c0e33c29b /protocols/JabberG/src/jabber_iqid.cpp | |
| parent | d7382326906b9f3bdd66704dd1b41f9299c1daa6 (diff) | |
- Jabber resource fix: in LAST_SEEN mode resource is skipped when no sessions were available;
- code cleanup;
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@5429 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_iqid.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 38a944eeb9..7dcb813a5c 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -465,7 +465,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo* pInfo) }
else db_unset(hContact, "CList", "MyHandle");
- if (getByte(hContact, "ChatRoom", 0)) {
+ if ( isChatRoom(hContact)) {
GCSESSION gcw = {0};
gcw.cbSize = sizeof(GCSESSION);
gcw.iType = GCW_CHATROOM;
@@ -474,7 +474,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo* pInfo) gcw.ptszID = jid;
gcw.ptszName = NEWTSTR_ALLOCA(jid);
- TCHAR* p = (TCHAR*)_tcschr(gcw.ptszName, '@');
+ TCHAR *p = (TCHAR*)_tcschr(gcw.ptszName, '@');
if (p)
*p = 0;
@@ -1400,7 +1400,7 @@ void CJabberProto::OnIqResultGetClientAvatar(HXML iqNode) }
if (n == NULL) {
- TCHAR szJid[ JABBER_MAX_JID_LEN ];
+ TCHAR szJid[JABBER_MAX_JID_LEN];
lstrcpyn(szJid, from, SIZEOF(szJid));
TCHAR *res = _tcschr(szJid, _T('/'));
if (res != NULL)
@@ -1448,7 +1448,7 @@ void CJabberProto::OnIqResultGetServerAvatar(HXML iqNode) }
if (n == NULL) {
- TCHAR szJid[ JABBER_MAX_JID_LEN ];
+ TCHAR szJid[JABBER_MAX_JID_LEN];
lstrcpyn(szJid, from, SIZEOF(szJid));
TCHAR *res = _tcschr(szJid, _T('/'));
if (res != NULL)
|