From a0a2de3b4d2facb25bbead59873cbf7f58f1d62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 8 Mar 2017 22:28:00 +0100 Subject: =?UTF-8?q?Revert=20"Don=E2=80=99t=20send=20the=20unavailable=20pr?= =?UTF-8?q?esence=20to=20all=20resources,=20in=20the=20virtual=20channel"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 38ff50f5d2ca356f659429ff57546bd2364a0fef. --- src/bridge/bridge.cpp | 2 +- src/irc/irc_client.cpp | 4 ++-- 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 -- cgit v1.2.3