summaryrefslogtreecommitdiff
path: root/src/bridge/bridge.hpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2020-03-11 18:41:43 +0100
committerlouiz’ <louiz@louiz.org>2020-03-11 18:41:43 +0100
commit212e8e59897c65e50f9d89949824a32d383201f4 (patch)
tree6c8628cb616ff7977176ee2316f115fa5cc2a9d9 /src/bridge/bridge.hpp
parenta0d24b48471e5307fda077a11491a3c44cbbdfaf (diff)
parent470ba2e4e486d922b2585219b790371ec7df934a (diff)
downloadbiboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.gz
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.bz2
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.tar.xz
biboumi-212e8e59897c65e50f9d89949824a32d383201f4.zip
Merge remote-tracking branch 'linkmauve/die-gc1.0-die'
Diffstat (limited to 'src/bridge/bridge.hpp')
-rw-r--r--src/bridge/bridge.hpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp
index a94f07b..6b15478 100644
--- a/src/bridge/bridge.hpp
+++ b/src/bridge/bridge.hpp
@@ -72,14 +72,12 @@ public:
**/
/**
- * Try to join an irc_channel, does nothing and return true if the channel
- * was already joined.
+ * Try to join an irc_channel.
*/
bool join_irc_channel(const Iid& iid, std::string nickname,
const std::string& password,
const std::string& resource,
- HistoryLimit history_limit,
- const bool force_join);
+ HistoryLimit history_limit);
void send_channel_message(const Iid& iid, const std::string& body, std::string id, std::vector<XmlNode> nodes_to_reflect);
void send_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG");