mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don’t send the unavailable presence to all resources, in the virtual channel"

Browse Source 
This reverts commit 38ff50f5d2.
This commit is contained in:
louiz’
2017-03-08 22:28:00 +01:00
parent 38ff50f5d2
commit a0a2de3b4d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+1 -1
View File
@@ -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) for (auto it = this->irc_clients.begin(); it != this->irc_clients.end(); ++it)
{ {
it->second->send_quit_command(exit_message); it->second->send_quit_command(exit_message);
it->second->leave_dummy_channel(exit_message, ""); it->second->leave_dummy_channel(exit_message);
} }
} }
src/irc/irc_client.cpp
+2 -2
View File
@@ -1161,14 +1161,14 @@ DummyIrcChannel& IrcClient::get_dummy_channel()
return this->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) if (!this->dummy_channel.joined)
return; return;
this->dummy_channel.joined = false; this->dummy_channel.joined = false;
this->dummy_channel.joining = false; this->dummy_channel.joining = false;
this->dummy_channel.remove_all_users(); 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 #ifdef BOTAN_FOUND