diff options
| author | louiz’ <louiz@louiz.org> | 2017-07-28 18:03:16 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-07-28 18:03:16 +0200 |
| commit | 8c92473a6681aaf671b21780202dde731772cee8 (patch) | |
| tree | 6ff2ae92dc06ff873c2d0e162f50cc649f3b8198 /src/xmpp/xmpp_component.hpp | |
| parent | 76f5fa81f2026770c907bee0e931aae8d8c7a1bd (diff) | |
| parent | 6187423e6ed834570783ef3097a6ef73cc58107a (diff) | |
| download | biboumi-8c92473a6681aaf671b21780202dde731772cee8.tar.gz biboumi-8c92473a6681aaf671b21780202dde731772cee8.tar.bz2 biboumi-8c92473a6681aaf671b21780202dde731772cee8.tar.xz biboumi-8c92473a6681aaf671b21780202dde731772cee8.zip | |
Merge branch 'master' into debian
Diffstat (limited to 'src/xmpp/xmpp_component.hpp')
| -rw-r--r-- | src/xmpp/xmpp_component.hpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp index ebe3ec8..22d5c48 100644 --- a/src/xmpp/xmpp_component.hpp +++ b/src/xmpp/xmpp_component.hpp @@ -124,12 +124,6 @@ public: const std::string& to, const bool self); /** - * Send an error to indicate that the user tried to join an invalid room - */ - void send_invalid_room_error(const std::string& muc_jid, - const std::string& nick, - const std::string& to); - /** * Send the MUC topic to the user */ void send_topic(const std::string& from, Xmpp::body&& xmpp_topic, const std::string& to, const std::string& who); @@ -146,7 +140,12 @@ public: /** * Send an unavailable presence for this nick */ - void send_muc_leave(const std::string& muc_name, const std::string& nick, Xmpp::body&& message, const std::string& jid_to, const bool self); + void send_muc_leave(const std::string& muc_name, + const std::string& nick, + Xmpp::body&& message, + const std::string& jid_to, + const bool self, + const bool user_requested); /** * Indicate that a participant changed his nick */ |