summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-03-08 22:28:00 +0100
committerlouiz’ <louiz@louiz.org>2017-03-08 22:28:00 +0100
commita0a2de3b4d2facb25bbead59873cbf7f58f1d62a (patch)
tree51aa16284f21d402ee879ca99c15429ba2be4e46 /src
parent38ff50f5d2ca356f659429ff57546bd2364a0fef (diff)
downloadbiboumi-a0a2de3b4d2facb25bbead59873cbf7f58f1d62a.tar.gz
biboumi-a0a2de3b4d2facb25bbead59873cbf7f58f1d62a.tar.bz2
biboumi-a0a2de3b4d2facb25bbead59873cbf7f58f1d62a.tar.xz
biboumi-a0a2de3b4d2facb25bbead59873cbf7f58f1d62a.zip
Revert "Don’t send the unavailable presence to all resources, in the virtual channel"
This reverts commit 38ff50f5d2ca356f659429ff57546bd2364a0fef.
Diffstat (limited to 'src')
-rw-r--r--src/bridge/bridge.cpp2
-rw-r--r--src/irc/irc_client.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 701ee11..7e2d8c1 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -62,7 +62,7 @@ void Bridge::shutdown(const std::string& exit_message)
for (auto it = this->irc_clients.begin(); it != this->irc_clients.end(); ++it)
{
it->second->send_quit_command(exit_message);
- it->second->leave_dummy_channel(exit_message, "");
+ it->second->leave_dummy_channel(exit_message);
}
}
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 9540f7a..d0970c1 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -1161,14 +1161,14 @@ DummyIrcChannel& IrcClient::get_dummy_channel()
return this->dummy_channel;
}
-void IrcClient::leave_dummy_channel(const std::string& exit_message, const std::string& resource)
+void IrcClient::leave_dummy_channel(const std::string& exit_message)
{
if (!this->dummy_channel.joined)
return;
this->dummy_channel.joined = false;
this->dummy_channel.joining = false;
this->dummy_channel.remove_all_users();
- this->bridge.send_muc_leave(Iid("%"s + this->hostname, this->chantypes), std::string(this->current_nick), exit_message, true, resource);
+ this->bridge.send_muc_leave(Iid("%"s + this->hostname, this->chantypes), std::string(this->current_nick), exit_message, true);
}
#ifdef BOTAN_FOUND