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

Use account muc_nick when no nick for bookmark

Browse Source
This commit is contained in:
James Booth 2014-05-23 00:55:30 +01:00
parent ff37b44a62
commit b85fd5e78c
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; ++autojoin_count;
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (name == NULL) { if (name == NULL) {
name = my_jid->localpart; name = account->muc_nick;
} }
log_debug("Autojoin %s with nick=%s", jid, name); 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); muc_join_room(jid, name, password, TRUE);
} }
jid_destroy(room_jid); jid_destroy(room_jid);
account_free(account);
} else { } else {
log_debug("Rejected autojoin %s (maximum has been reached)", jid); log_debug("Rejected autojoin %s (maximum has been reached)", jid);
} }