2 files changed, 4 insertions(+), 3 deletions(-)

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

@@ 58,7 58,7 @@ public:
    * Try to join an irc_channel, does nothing and return true if the channel
    * was already joined.
    */
-  bool join_irc_channel(const Iid& iid, const std::string& username, const std::string& password = "");
+  bool join_irc_channel(const Iid& iid, const std::string& username, const std::string& password);
   void send_channel_message(const Iid& iid, const std::string& body);
   void send_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG");
   void leave_irc_channel(Iid&& iid, std::string&& status_message);

@@ 339,8 339,9 @@ void XmppComponent::handle_presence(const Stanza& stanza)
           if (!own_nick.empty() && own_nick != to.resource)
             bridge->send_irc_nick_change(iid, to.resource);
           XmlNode* x = stanza.get_child("x", MUC_NS);
-          XmlNode* password = x? x->get_child("password", MUC_NS): NULL;
-          bridge->join_irc_channel(iid, to.resource, password? password->get_inner(): "");
+          XmlNode* password = x ? x->get_child("password", MUC_NS): nullptr;
+          bridge->join_irc_channel(iid, to.resource,
+                                   password ? password->get_inner() : "");
         }
       else if (type == "unavailable")
         {