aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-05-23 00:56:50 +01:00
commit ab096db181
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xmpp/bookmark.c
View File

@ -326,8 +326,10 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
++autojoin_count;
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (name == NULL) {
name = my_jid->localpart;
name = account->muc_nick;
}
log_debug("Autojoin %s with nick=%s", jid, name);
@ -337,6 +339,7 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
muc_join_room(jid, name, password, TRUE);
}
jid_destroy(room_jid);
account_free(account);
} else {
log_debug("Rejected autojoin %s (maximum has been reached)", jid);
}