From d7c1c6f9bfa994e9237df350469be9defa88f00a Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:29:48 +0000 Subject: [PATCH] Renamed ui_room_nick_change -> mucwin_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 44ba80b5..5865d84c 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -541,7 +541,7 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c // handle self nick change if (muc_nick_change_pending(room)) { muc_nick_change_complete(room, nick); - ui_room_nick_change(room, nick); + mucwin_nick_change(room, nick); // handle roster complete } else if (!muc_roster_complete(room)) { diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index adb18ee9..9035ee95 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -325,7 +325,7 @@ mucwin_occupant_nick_change(const char *const roomjid, } void -ui_room_nick_change(const char *const roomjid, const char *const nick) +mucwin_nick_change(const char *const roomjid, const char *const nick) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); if (window == NULL) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 294eb105..d6f81089 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -130,7 +130,7 @@ 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 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_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); void ui_room_update_occupants(const char *const roomjid); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 4abca9f7..e90c38c6 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -232,7 +232,7 @@ void mucwin_occupant_online(const char * const roomjid, const char * const nick, const char * const affiliation, const char * const show, const char * const status) {} 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_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) {} void ui_room_update_occupants(const char * const roomjid) {}