diff options
| -rw-r--r-- | src/event/server_events.c | 5 | ||||
| -rw-r--r-- | src/ui/mucwin.c | 32 | ||||
| -rw-r--r-- | src/ui/ui.h | 2 | ||||
| -rw-r--r-- | tests/unittests/ui/stub_ui.c | 2 |
4 files changed, 21 insertions, 20 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index 57758a52..c823e164 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -510,7 +510,10 @@ sv_ev_room_occupent_banned(const char *const room, const char *const nick, const const char *const reason) { muc_roster_remove(room, nick); - mucwin_occupant_banned(room, nick, actor, reason); + ProfMucWin *mucwin = wins_get_muc(room); + if (mucwin) { + mucwin_occupant_banned(mucwin, nick, actor, reason); + } occupantswin_occupants(room); } diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index db7ebd64..4b07ffdc 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -263,27 +263,25 @@ mucwin_occupant_kicked(ProfMucWin *mucwin, const char *const nick, const char *c } void -mucwin_occupant_banned(const char *const roomjid, const char *const nick, const char *const actor, +mucwin_occupant_banned(ProfMucWin *mucwin, const char *const nick, const char *const actor, const char *const reason) { - ProfWin *window = (ProfWin*)wins_get_muc(roomjid); - if (window == NULL) { - log_error("Received ban for room participant %s, but no window open for %s.", nick, roomjid); - } else { - GString *message = g_string_new(nick); - g_string_append(message, " has been banned from the room"); - if (actor) { - g_string_append(message, " by "); - g_string_append(message, actor); - } - if (reason) { - g_string_append(message, ", reason: "); - g_string_append(message, reason); - } + assert(mucwin != NULL); - win_vprint(window, '!', 0, NULL, 0, THEME_OFFLINE, "", "<- %s", message->str); - g_string_free(message, TRUE); + ProfWin *window = (ProfWin*)mucwin; + GString *message = g_string_new(nick); + g_string_append(message, " has been banned from the room"); + if (actor) { + g_string_append(message, " by "); + g_string_append(message, actor); } + if (reason) { + g_string_append(message, ", reason: "); + g_string_append(message, reason); + } + + win_vprint(window, '!', 0, NULL, 0, THEME_OFFLINE, "", "<- %s", message->str); + g_string_free(message, TRUE); } void diff --git a/src/ui/ui.h b/src/ui/ui.h index 453943c0..543019c3 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -185,7 +185,7 @@ void mucwin_room_info_error(ProfMucWin *mucwin, const char *const error); void mucwin_room_disco_info(ProfMucWin *mucwin, GSList *identities, GSList *features); void mucwin_occupant_kicked(ProfMucWin *mucwin, const char *const nick, const char *const actor, const char *const reason); -void mucwin_occupant_banned(const char *const roomjid, const char *const nick, const char *const actor, +void mucwin_occupant_banned(ProfMucWin *mucwin, const char *const nick, const char *const actor, const char *const reason); void mucwin_broadcast(const char *const roomjid, const char *const message); void mucwin_occupant_offline(ProfMucWin *mucwin, const char *const nick); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 9426ea59..7b67d9be 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -222,7 +222,7 @@ void ui_room_kicked(const char * const roomjid, const char * const actor, const void mucwin_occupant_kicked(ProfMucWin *mucwin, const char * const nick, const char * const actor, const char * const reason) {} void ui_room_banned(const char * const roomjid, const char * const actor, const char * const reason) {} -void mucwin_occupant_banned(const char * const roomjid, const char * const nick, const char * const actor, +void mucwin_occupant_banned(ProfMucWin *mucwin, const char * const nick, const char * const actor, const char * const reason) {} void ui_leave_room(const char * const roomjid) {} void mucwin_broadcast(const char * const roomjid, |