mirror of
https://github.com/profanity-im/profanity.git
synced 2024-11-03 19:37:16 -05:00
parent
b738e8f363
commit
70452c1194
@ -2725,6 +2725,7 @@ static gboolean
|
||||
_cmd_join(gchar **args, struct cmd_help_t help)
|
||||
{
|
||||
jabber_conn_status_t conn_status = jabber_get_connection_status();
|
||||
ProfAccount *account = accounts_get_account(jabber_get_account_name());
|
||||
|
||||
if (conn_status != JABBER_CONNECTED) {
|
||||
cons_show("You are not currently connected.");
|
||||
@ -2749,7 +2750,6 @@ _cmd_join(gchar **args, struct cmd_help_t help)
|
||||
|
||||
// server not supplied (room), use account preference
|
||||
} else {
|
||||
ProfAccount *account = accounts_get_account(jabber_get_account_name());
|
||||
g_string_append(room_str, args[0]);
|
||||
g_string_append(room_str, "@");
|
||||
g_string_append(room_str, account->muc_service);
|
||||
@ -2762,7 +2762,6 @@ _cmd_join(gchar **args, struct cmd_help_t help)
|
||||
|
||||
// otherwise use account preference
|
||||
} else {
|
||||
ProfAccount *account = accounts_get_account(jabber_get_account_name());
|
||||
nick = account->muc_nick;
|
||||
}
|
||||
|
||||
@ -2778,6 +2777,7 @@ _cmd_join(gchar **args, struct cmd_help_t help)
|
||||
jid_destroy(room_jid);
|
||||
jid_destroy(my_jid);
|
||||
g_string_free(room_str, TRUE);
|
||||
accounts_free_account(account);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user