From 27632581ebdeb97a27afdc1e58ab21ac52198715 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:28:53 +0000 Subject: [PATCH] Renamed ui_room_member_nick_change -> mucwin_occupant_nick_change --- 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 de7b479f..44ba80b5 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -628,7 +628,7 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const // handle nickname change char *old_nick = muc_roster_nick_change_complete(room, nick); if (old_nick) { - ui_room_member_nick_change(room, old_nick, nick); + mucwin_occupant_nick_change(room, old_nick, nick); free(old_nick); occupantswin_occupants(room); return; diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index d6d336b9..adb18ee9 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -313,7 +313,7 @@ mucwin_occupant_presence(const char *const roomjid, const char *const nick, } void -ui_room_member_nick_change(const char *const roomjid, +mucwin_occupant_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); diff --git a/src/ui/ui.h b/src/ui/ui.h index 0e2a8ace..294eb105 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -129,7 +129,7 @@ void ui_room_broadcast(const char *const roomjid, const char *const message); void mucwin_occupant_offline(const char *const roomjid, const char *const nick); void mucwin_occupant_online(const char *const roomjid, const char *const nick, const char *const roles, const char *const affiliation, const char *const show, const char *const status); -void ui_room_member_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick); +void mucwin_occupant_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick); void ui_room_nick_change(const char *const roomjid, const char *const nick); void mucwin_occupant_presence(const char *const roomjid, const char *const nick, const char *const show, const char *const status); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 9e6e3979..4abca9f7 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -230,7 +230,7 @@ void ui_room_broadcast(const char * const roomjid, void mucwin_occupant_offline(const char * const roomjid, const char * const nick) {} void mucwin_occupant_online(const char * const roomjid, const char * const nick, const char * const roles, const char * const affiliation, const char * const show, const char * const status) {} -void ui_room_member_nick_change(const char * const roomjid, +void mucwin_occupant_nick_change(const char * const roomjid, const char * const old_nick, const char * const nick) {} void ui_room_nick_change(const char * const roomjid, const char * const nick) {} void mucwin_occupant_presence(const char * const roomjid,