4 files changed, 15 insertions(+), 4 deletions(-)

M louloulibs/xmpp/xmpp_component.cpp
M louloulibs/xmpp/xmpp_component.hpp
M src/bridge/bridge.cpp
M src/xmpp/biboumi_component.cpp

@@ 631,6 631,16 @@ void XmppComponent::send_iq_version_request(const std::string& from,
   this->send_stanza(iq);
 }
 
+void XmppComponent::send_iq_result_full_jid(const std::string& id, const std::string& to_jid, const std::string& from_full_jid)
+{
+  Stanza iq("iq");
+  iq["from"] = from_full_jid;
+  iq["to"] = to_jid;
+  iq["id"] = id;
+  iq["type"] = "result";
+  this->send_stanza(iq);
+}
+
 void XmppComponent::send_iq_result(const std::string& id, const std::string& to_jid, const std::string& from_local_part)
 {
   Stanza iq("iq");

@@ 200,6 200,8 @@ public:
    * Send an empty iq of type result
    */
   void send_iq_result(const std::string& id, const std::string& to_jid, const std::string& from);
+  void send_iq_result_full_jid(const std::string& id, const std::string& to_jid,
+                               const std::string& from_full_jid);
 
   void handle_handshake(const Stanza& stanza);
   void handle_error(const Stanza& stanza);

@@ 483,8 483,7 @@ void Bridge::send_irc_user_ping_request(const std::string& irc_hostname, const s
           const std::string id = body.substr(6, body.size() - 7);
           if (id != iq_id)
             return false;
-          Jid jid(from_jid);
-          this->xmpp.send_iq_result(iq_id, to_jid, jid.local);
+          this->xmpp.send_iq_result_full_jid(iq_id, to_jid, from_jid);
           return true;
         }
       if (message.command == "401" && message.arguments[1] == nick)

@@ 580,8 580,8 @@ void BiboumiComponent::send_iq_version_request(const std::string& from,
 }
 
 void BiboumiComponent::send_ping_request(const std::string& from,
-                                      const std::string& jid_to,
-                                      const std::string& id)
+                                         const std::string& jid_to,
+                                         const std::string& id)
 {
   Stanza iq("iq");
   iq["type"] = "get";