From e3ee824e5c5548c13605e4f2e2ded9491c1c1479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Thu, 20 Apr 2017 10:09:35 +0200
Subject: Revert "Cancel the IRC server linger timer when we try to-rejoin a
channel on it"
This reverts commit 45f7396c8d30ed37570c4ecdaa886388f9beba3e.
---
src/bridge/bridge.cpp | 7 -------
src/bridge/bridge.hpp | 1 -
2 files changed, 8 deletions(-)
(limited to 'src')
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 589bd03..0a9a412 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -170,7 +170,6 @@ bool Bridge::join_irc_channel(const Iid& iid, const std::string& nickname, const
const std::string& resource)
{
const auto& hostname = iid.get_server();
- this->cancel_linger_timer(hostname);
IrcClient* irc = this->make_irc_client(hostname, nickname);
this->add_resource_to_server(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);
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);
-}
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp
index d8facad..ce9c605 100644
--- a/src/bridge/bridge.hpp
+++ b/src/bridge/bridge.hpp
@@ -241,7 +241,6 @@ public:
* configured linger time is expired.
*/
void quit_or_start_linger_timer(const std::string& irc_hostname);
- void cancel_linger_timer(const std::string& irc_hostname);
private:
/**
--
cgit v1.2.3