summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_message_handlers.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-08-23 15:17:37 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-08-23 15:17:45 +0300
commit3d977685e7dbc7b1f5fa3264c8a014b5b5d5ec43 (patch)
tree3be179d8a33dd4ab623d330f628ef09f078f3fa4 /protocols/JabberG/src/jabber_message_handlers.cpp
parent475debe8c34567137be9c1fd2252ed8816c6da31 (diff)
code cleaning
Diffstat (limited to 'protocols/JabberG/src/jabber_message_handlers.cpp')
-rw-r--r--protocols/JabberG/src/jabber_message_handlers.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index 8b3496bc9e..c0684869d0 100644
--- a/protocols/JabberG/src/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
@@ -31,9 +31,9 @@ BOOL CJabberProto::OnMessageError(HXML node, ThreadData*, CJabberMessageInfo* pI
// we check if is message delivery failure
int id = JabberGetPacketID(node);
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_ROSTER, pInfo->GetFrom());
- if (item == NULL)
+ if (item == nullptr)
item = ListGetItemPtr(LIST_CHATROOM, pInfo->GetFrom());
- if (item != NULL) { // yes, it is
+ if (item != nullptr) { // yes, it is
wchar_t *szErrText = JabberErrorMsg(pInfo->GetChildNode());
if (id != -1) {
char *errText = mir_u2a(szErrText);
@@ -48,7 +48,7 @@ BOOL CJabberProto::OnMessageError(HXML node, ThreadData*, CJabberMessageInfo* pI
else
mir_snwprintf(buf, L"%s:\n%s", pInfo->GetFrom(), szErrText);
- MsgPopup(NULL, buf, TranslateT("Jabber Error"));
+ MsgPopup(0, buf, TranslateT("Jabber Error"));
}
mir_free(szErrText);
}