diff options
author | James Booth <boothj5@gmail.com> | 2015-11-01 23:30:44 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-11-01 23:30:44 +0000 |
commit | 363fda82c16efc8d296a50867edd6fcd45271c11 (patch) | |
tree | 81d6ab3bf5e8ca1ef222d466c07303ea8d7f842a /src/ui | |
parent | cb587b07722ed1d071d606cbdf43ef4cdd7769eb (diff) | |
download | profani-tty-363fda82c16efc8d296a50867edd6fcd45271c11.tar.gz |
mucwin_room_info_error takes ProfMucWin
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/mucwin.c | 12 | ||||
-rw-r--r-- | src/ui/ui.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 2dad9d8f..d5723fe8 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -143,13 +143,13 @@ mucwin_occupant_role_and_affiliation_change(ProfMucWin *mucwin, const char *cons } void -mucwin_room_info_error(const char *const roomjid, const char *const error) +mucwin_room_info_error(ProfMucWin *mucwin, const char *const error) { - ProfWin *window = (ProfWin*)wins_get_muc(roomjid); - if (window) { - win_vprint(window, '!', 0, NULL, 0, 0, "", "Room info request failed: %s", error); - win_print(window, '-', 0, NULL, 0, 0, "", ""); - } + assert(mucwin != NULL); + + ProfWin *window = (ProfWin*)mucwin; + win_vprint(window, '!', 0, NULL, 0, 0, "", "Room info request failed: %s", error); + win_print(window, '-', 0, NULL, 0, 0, "", ""); } void diff --git a/src/ui/ui.h b/src/ui/ui.h index 242d8695..b8115e8a 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -181,7 +181,7 @@ void mucwin_requires_config(const char *const roomjid); void mucwin_info(ProfMucWin *mucwin); void mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role); void mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation); -void mucwin_room_info_error(const char *const roomjid, const char *const error); +void mucwin_room_info_error(ProfMucWin *mucwin, const char *const error); void mucwin_room_disco_info(const char *const roomjid, GSList *identities, GSList *features); void mucwin_occupant_kicked(const char *const roomjid, const char *const nick, const char *const actor, const char *const reason); |