diff options
| author | louiz’ <louiz@louiz.org> | 2017-03-06 03:04:26 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-03-06 03:04:26 +0100 |
| commit | a1349361d2c15929e8260536c9091f2a4c2048a4 (patch) | |
| tree | a2eb734566a7ae708a705b071f04cc2f20bb2e0e /src/xmpp/biboumi_component.cpp | |
| parent | ef3c6c28dd1f58ad60928487115a9124ffb99266 (diff) | |
| parent | 11c63ebceb07d9b65ed16182139477ea79739c12 (diff) | |
| download | biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.gz biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.bz2 biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.xz biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.zip | |
Merge branch 'master' into debian
Diffstat (limited to 'src/xmpp/biboumi_component.cpp')
| -rw-r--r-- | src/xmpp/biboumi_component.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp index bd6975e..2783b93 100644 --- a/src/xmpp/biboumi_component.cpp +++ b/src/xmpp/biboumi_component.cpp @@ -179,10 +179,11 @@ void BiboumiComponent::handle_presence(const Stanza& stanza) } catch (const IRCNotConnected& ex) { - this->send_stanza_error("presence", from_str, to_str, id, - "cancel", "remote-server-not-found", - "Not connected to IRC server "s + ex.hostname, - true); + if (type != "unavailable") + this->send_stanza_error("presence", from_str, to_str, id, + "cancel", "remote-server-not-found", + "Not connected to IRC server "s + ex.hostname, + true); } stanza_error.disable(); } @@ -737,7 +738,7 @@ void BiboumiComponent::send_irc_server_disco_info(const std::string& id, const s this->send_stanza(iq); } -void BiboumiComponent::send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_from, const std::string& jid_to) +void BiboumiComponent::send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_to, const std::string& jid_from) { Stanza iq("iq"); { |