about summary refs log tree commit diff stats
path: root/src/command
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-03-08 21:10:23 +0000
committerJames Booth <boothj5@gmail.com>2014-03-08 21:10:23 +0000
commitdd1ee18c72268839de8af64de5eb07c5a2499ff2 (patch)
tree6fab72178d19c201d2b73b5d503291cc2e423988 /src/command
parente9b5d3294b3ccb8e5fb97e1a6e1d129631a72caa (diff)
downloadprofani-tty-dd1ee18c72268839de8af64de5eb07c5a2499ff2.tar.gz
Added test for /join with nick option
Diffstat (limited to 'src/command')
-rw-r--r--src/command/commands.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/command/commands.c b/src/command/commands.c
index 7738e7f2..e6d575f5 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1659,9 +1659,9 @@ cmd_join(gchar **args, struct cmd_help_t help)
     Jid *room_jid = jid_create_from_bare_and_resource(room, nick);
 
     if (!muc_room_is_active(room_jid)) {
-        presence_join_room(room_jid, passwd);
+        presence_join_room(room, nick, passwd);
     }
-    ui_room_join(room_jid);
+    ui_room_join(room);
     muc_remove_invite(room);
 
     jid_destroy(room_arg);