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

Revert "Cancel the IRC server linger timer when we try to-rejoin a channel on it"

Browse Source 
This reverts commit 45f7396c8d.
This commit is contained in:
louiz’
2017-04-20 10:09:35 +02:00
parent 42677ae46c
commit e3ee824e5c
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
-7
View File
@@ -170,7 +170,6 @@ bool Bridge::join_irc_channel(const Iid& iid, const std::string& nickname, const
const std::string& resource) const std::string& resource)
{ {
const auto& hostname = iid.get_server(); const auto& hostname = iid.get_server();
this->cancel_linger_timer(hostname);
IrcClient* irc = this->make_irc_client(hostname, nickname); IrcClient* irc = this->make_irc_client(hostname, nickname);
this->add_resource_to_server(hostname, resource); this->add_resource_to_server(hostname, resource);
auto res_in_chan = this->is_resource_in_chan(ChannelKey{iid.get_local(), hostname}, resource); auto res_in_chan = this->is_resource_in_chan(ChannelKey{iid.get_local(), hostname}, resource);
@@ -1264,9 +1263,3 @@ void Bridge::quit_or_start_linger_timer(const std::string& irc_hostname)
}, event_name); }, event_name);
TimedEventsManager::instance().add_event(std::move(event)); TimedEventsManager::instance().add_event(std::move(event));
} }
void Bridge::cancel_linger_timer(const std::string& irc_hostname)
{
const auto event_name = "IRCLINGER:" + irc_hostname + ".." + this->get_bare_jid();
TimedEventsManager::instance().cancel(event_name);
}
src/bridge/bridge.hpp
-1
View File
@@ -241,7 +241,6 @@ public:
* configured linger time is expired. * configured linger time is expired.
*/ */
void quit_or_start_linger_timer(const std::string& irc_hostname); void quit_or_start_linger_timer(const std::string& irc_hostname);
void cancel_linger_timer(const std::string& irc_hostname);
private: private:
/** /**