From d47da01c0009a0f40652dd3bb0da564edba412ab Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:51:24 +0000 Subject: [PATCH] Renamed ui_show_room_role_list -> mucwin_show_role_list --- src/command/commands.c | 6 +++--- src/ui/mucwin.c | 2 +- src/ui/ui.h | 2 +- tests/unittests/ui/stub_ui.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/command/commands.c b/src/command/commands.c index cab92ef7..3910af34 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1209,15 +1209,15 @@ _who_room(ProfWin *window, const char *const command, gchar **args) // role or affiliation filter } else { if (g_strcmp0(args[0], "moderator") == 0) { - ui_show_room_role_list(mucwin, MUC_ROLE_MODERATOR); + mucwin_show_role_list(mucwin, MUC_ROLE_MODERATOR); return; } if (g_strcmp0(args[0], "participant") == 0) { - ui_show_room_role_list(mucwin, MUC_ROLE_PARTICIPANT); + mucwin_show_role_list(mucwin, MUC_ROLE_PARTICIPANT); return; } if (g_strcmp0(args[0], "visitor") == 0) { - ui_show_room_role_list(mucwin, MUC_ROLE_VISITOR); + mucwin_show_role_list(mucwin, MUC_ROLE_VISITOR); return; } diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index d0e18e70..6dd93bcb 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -681,7 +681,7 @@ mucwin_handle_role_list(const char *const roomjid, const char *const role, GSLis } void -ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role) +mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role) { ProfWin *window = (ProfWin*) mucwin; GSList *occupants = muc_occupants_by_role(mucwin->roomjid, role); diff --git a/src/ui/ui.h b/src/ui/ui.h index adc6db0b..982f838d 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -112,7 +112,7 @@ void mucwin_subject(const char *const roomjid, const char *const nick, const cha void mucwin_requires_config(const char *const roomjid); void ui_room_destroy(const char *const roomjid); void ui_show_room_info(ProfMucWin *mucwin); -void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role); +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_disco_info(const char *const roomjid, GSList *identities, GSList *features); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 55685dab..a81654a9 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -212,7 +212,7 @@ void mucwin_subject(const char * const roomjid, const char * const nick, const c void mucwin_requires_config(const char * const roomjid) {} void ui_room_destroy(const char * const roomjid) {} void ui_show_room_info(ProfMucWin *mucwin) {} -void ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role) {} +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_disco_info(const char * const roomjid, GSList *identities, GSList *features) {}