From 1e47749f3a42a04ae80b921a75a650838d7c7f91 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:25:55 +0000 Subject: [PATCH] Renamed ui_room_member_banned -> mucwin_occupant_banned --- src/event/server_events.c | 2 +- src/ui/mucwin.c | 2 +- src/ui/ui.h | 2 +- tests/unittests/ui/stub_ui.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/event/server_events.c b/src/event/server_events.c index 161e05a8..63e52b69 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -506,7 +506,7 @@ sv_ev_room_occupent_banned(const char *const room, const char *const nick, const const char *const reason) { muc_roster_remove(room, nick); - ui_room_member_banned(room, nick, actor, reason); + mucwin_occupant_banned(room, nick, actor, reason); occupantswin_occupants(room); } diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 14f330a2..e6ce912a 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -256,7 +256,7 @@ mucwin_occupant_kicked(const char *const roomjid, const char *const nick, const } void -ui_room_member_banned(const char *const roomjid, const char *const nick, const char *const actor, +mucwin_occupant_banned(const char *const roomjid, const char *const nick, const char *const actor, const char *const reason) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); diff --git a/src/ui/ui.h b/src/ui/ui.h index bdf2c9bf..1822d75a 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -122,7 +122,7 @@ void ui_room_kicked(const char *const roomjid, const char *const actor, const ch void mucwin_occupant_kicked(const char *const roomjid, 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 ui_room_member_banned(const char *const roomjid, const char *const nick, const char *const actor, +void mucwin_occupant_banned(const char *const roomjid, const char *const nick, const char *const actor, const char *const reason); void ui_leave_room(const char *const roomjid); void ui_room_broadcast(const char *const roomjid, const char *const message); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 761b2771..849056aa 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(const char * const roomjid, 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 ui_room_member_banned(const char * const roomjid, const char * const nick, const char * const actor, +void mucwin_occupant_banned(const char * const roomjid, const char * const nick, const char * const actor, const char * const reason) {} void ui_leave_room(const char * const roomjid) {} void ui_room_broadcast(const char * const roomjid,