summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_groupchat.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-02-24 13:37:47 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-02-24 13:37:47 +0300
commit7b32f314110ff2cdb2d2ddade8e7b8ff9e5b51fb (patch)
tree8f815b6cc3b7df7692b39126355d84f8e8310308 /protocols/JabberG/src/jabber_groupchat.cpp
parentf5c73783f842f5289ec43e346ec233b6a9574c6f (diff)
Jabber: more strict XEP-045 compliance
Diffstat (limited to 'protocols/JabberG/src/jabber_groupchat.cpp')
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index d8abeec340..47bd88b9b7 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -255,11 +255,10 @@ void CJabberProto::GroupchatJoinRoom(const char *server, const char *room, const
replaceStr(item->password, info.m_password);
int status = (m_iStatus == ID_STATUS_INVISIBLE) ? ID_STATUS_ONLINE : m_iStatus;
- if (mir_strlen(info.m_password)) {
- XmlNode x("x"); x << XATTR("xmlns", JABBER_FEAT_MUC) << XCHILD("password", info.m_password);
- SendPresenceTo(status, text, x);
- }
- else SendPresenceTo(status, text);
+ XmlNode x("x"); x << XATTR("xmlns", JABBER_FEAT_MUC);
+ if (mir_strlen(info.m_password))
+ x << XCHILD("password", info.m_password);
+ SendPresenceTo(status, text, x);
}
////////////////////////////////////////////////////////////////////////////////