summaryrefslogtreecommitdiff
path: root/src/xmpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-12-11 17:05:52 +0100
committerlouiz’ <louiz@louiz.org>2016-12-11 17:05:52 +0100
commiteca31ce8db104f17ac74fd74aa9d7ef7e8f1470a (patch)
tree97399877e23af6f09aad646bfe4ba46027bf16d0 /src/xmpp
parentf653906f9de8cbcecf5717e18c696d1029fc2c8f (diff)
downloadbiboumi-eca31ce8db104f17ac74fd74aa9d7ef7e8f1470a.tar.gz
biboumi-eca31ce8db104f17ac74fd74aa9d7ef7e8f1470a.tar.bz2
biboumi-eca31ce8db104f17ac74fd74aa9d7ef7e8f1470a.tar.xz
biboumi-eca31ce8db104f17ac74fd74aa9d7ef7e8f1470a.zip
Do not change the nick when joining a second room with a different nick
As the doc says, the nick changes must be explicit in an already joined room, and not when joining a room.
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/biboumi_component.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 262596c..d646656 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -149,7 +149,7 @@ void BiboumiComponent::handle_presence(const Stanza& stanza)
{
const std::string own_nick = bridge->get_own_nick(iid);
if (!own_nick.empty() && own_nick != to.resource)
- bridge->send_irc_nick_change(iid, to.resource);
+ bridge->send_irc_nick_change(iid, to.resource, from.resource);
const XmlNode* x = stanza.get_child("x", MUC_NS);
const XmlNode* password = x ? x->get_child("password", MUC_NS): nullptr;
bridge->join_irc_channel(iid, to.resource, password ? password->get_inner(): "",