diff options
author | James Booth <boothj5@gmail.com> | 2014-03-08 21:20:26 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-03-08 21:20:26 +0000 |
commit | b177250f47f5599943b6772aed43de49834147e2 (patch) | |
tree | 822ad8a0b4e38c84b1e004922e1a8e0308d809ac /src/command | |
parent | dd1ee18c72268839de8af64de5eb07c5a2499ff2 (diff) | |
download | profani-tty-b177250f47f5599943b6772aed43de49834147e2.tar.gz |
Refactored muc_room_is_active to only take room, rather than full jid
Diffstat (limited to 'src/command')
-rw-r--r-- | src/command/commands.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index e6d575f5..5e594184 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1656,16 +1656,13 @@ cmd_join(gchar **args, struct cmd_help_t help) nick = account->muc_nick; } - Jid *room_jid = jid_create_from_bare_and_resource(room, nick); - - if (!muc_room_is_active(room_jid)) { + if (!muc_room_is_active(room)) { presence_join_room(room, nick, passwd); } ui_room_join(room); muc_remove_invite(room); jid_destroy(room_arg); - jid_destroy(room_jid); g_string_free(room_str, TRUE); account_free(account); |