mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a little bit of style stuf from previous commit

Browse Source
This commit is contained in:
Florent Le Coz
2015-01-14 13:36:42 +01:00
parent e4fcbd3030
commit f9e259c266
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.hpp
+1 -1
View File
@@ -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);
src/xmpp/xmpp_component.cpp
+3 -2
View File
@@ -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")
{