Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-11 23:38:44 +01:00
7 changed files with 32 additions and 28 deletions

View File

@@ -372,7 +372,9 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
char *password = NULL;
xmpp_stanza_t *password_st = xmpp_stanza_get_child_by_name(xns_muc_user, STANZA_NAME_PASSWORD);
password = xmpp_stanza_get_text(password_st);
if (password_st) {
password = xmpp_stanza_get_text(password_st);
}
handle_room_invite(INVITE_MEDIATED, invitor, room, reason, password);
jid_destroy(jidp);