summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);
}
////////////////////////////////////////////////////////////////////////////////