devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-31 06:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chat-sessions

Browse Source
This commit is contained in:
James Booth
2014-12-27 00:58:33 +00:00
parent e602c2909e 3b95946083
commit 53ecd3b383
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/commands.c
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(); jabber_conn_status_t conn_status = jabber_get_connection_status();
win_type_t win_type = ui_current_win_type(); win_type_t win_type = ui_current_win_type();
PContact pcontact = NULL; PContact pcontact = NULL;
char *room = NULL;
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently 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); Occupant *occupant = muc_roster_item(mucwin->roomjid, usr);
if (occupant) { if (occupant) {
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
win_show_occupant_info(current, room, occupant); win_show_occupant_info(current, mucwin->roomjid, occupant);
} else { } else {
ui_current_print_line("No such occupant \"%s\" in room.", usr); ui_current_print_line("No such occupant \"%s\" in room.", usr);
} }