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

Merge branch 'master' into nextdev

This commit is contained in:
James Booth 2013-07-31 19:32:15 +01:00
commit 992ee28091

View File

@ -2702,10 +2702,15 @@ _cmd_join(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} }
Jid *room_arg = jid_create(args[0]);
if (room_arg == NULL) {
cons_show_error("Specified room has incorrect format");
return TRUE;
}
int num_args = g_strv_length(args); int num_args = g_strv_length(args);
char *room = NULL; char *room = NULL;
char *nick = NULL; char *nick = NULL;
Jid *room_arg = jid_create(args[0]);
GString *room_str = g_string_new(""); GString *room_str = g_string_new("");
Jid *my_jid = jid_create(jabber_get_fulljid()); Jid *my_jid = jid_create(jabber_get_fulljid());