summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_thread.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
-rw-r--r--protocols/JabberG/src/jabber_thread.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 64428e6671..48a14ebc1d 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1732,7 +1732,7 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info)
RebuildInfoFrame();
}
else {
- HXML n = xmlGetChild(node , "nick");
+ HXML n = xmlGetChild(node, "nick");
nick = (n == NULL) ? JabberNickFromJID(from) : mir_tstrdup(xmlGetText(n));
if (nick != NULL) {
Log("%S (%S) requests authorization", nick, from);
@@ -1742,24 +1742,19 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info)
return;
}
- if ( !_tcscmp(type, _T("unsubscribe"))) {
+ if ( !_tcscmp(type, _T("unsubscribe")))
if (hContact = HContactFromJID(from))
AddDbPresenceEvent(hContact, JABBER_DB_EVENT_PRESENCE_UNSUBSCRIBE);
- }
- if ( !_tcscmp(type, _T("unsubscribed"))) {
+ if ( !_tcscmp(type, _T("unsubscribed")))
if (hContact = HContactFromJID(from))
AddDbPresenceEvent(hContact, JABBER_DB_EVENT_PRESENCE_UNSUBSCRIBED);
- }
- if ( !_tcscmp(type, _T("error"))) {
- if (hContact = HContactFromJID(from)) {
+ if ( !_tcscmp(type, _T("error")))
+ if (hContact = HContactFromJID(from))
AddDbPresenceEvent(hContact, JABBER_DB_EVENT_PRESENCE_ERROR);
- }
- }
if ( !_tcscmp(type, _T("subscribed"))) {
-
if (hContact = HContactFromJID(from))
AddDbPresenceEvent(hContact, JABBER_DB_EVENT_PRESENCE_SUBSCRIBED);