1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Merge branch 'master' into chat-sessions

This commit is contained in:
James Booth 2014-12-27 00:58:33 +00:00
commit 53ecd3b383

View File

@ -1710,7 +1710,6 @@ cmd_info(gchar **args, struct cmd_help_t help)
jabber_conn_status_t conn_status = jabber_get_connection_status();
win_type_t win_type = ui_current_win_type();
PContact pcontact = NULL;
char *room = NULL;
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
@ -1725,7 +1724,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
Occupant *occupant = muc_roster_item(mucwin->roomjid, usr);
if (occupant) {
ProfWin *current = wins_get_current();
win_show_occupant_info(current, room, occupant);
win_show_occupant_info(current, mucwin->roomjid, occupant);
} else {
ui_current_print_line("No such occupant \"%s\" in room.", usr);
}