From 381bce385fff894e2222fc8271f1090aafa4844d Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 21:46:57 +0000 Subject: [PATCH] Renamed ui_show_room_affiliation_list -> mucwin_show_affiliation_list --- src/command/commands.c | 8 ++++---- src/ui/mucwin.c | 2 +- src/ui/ui.h | 2 +- tests/unittests/ui/stub_ui.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/command/commands.c b/src/command/commands.c index 59e3979f..cab92ef7 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1222,19 +1222,19 @@ _who_room(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "owner") == 0) { - ui_show_room_affiliation_list(mucwin, MUC_AFFILIATION_OWNER); + mucwin_show_affiliation_list(mucwin, MUC_AFFILIATION_OWNER); return; } if (g_strcmp0(args[0], "admin") == 0) { - ui_show_room_affiliation_list(mucwin, MUC_AFFILIATION_ADMIN); + mucwin_show_affiliation_list(mucwin, MUC_AFFILIATION_ADMIN); return; } if (g_strcmp0(args[0], "member") == 0) { - ui_show_room_affiliation_list(mucwin, MUC_AFFILIATION_MEMBER); + mucwin_show_affiliation_list(mucwin, MUC_AFFILIATION_MEMBER); return; } if (g_strcmp0(args[0], "outcast") == 0) { - ui_show_room_affiliation_list(mucwin, MUC_AFFILIATION_OUTCAST); + mucwin_show_affiliation_list(mucwin, MUC_AFFILIATION_OUTCAST); return; } } diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index e1c5bac3..3a57f2da 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -582,7 +582,7 @@ mucwin_handle_affiliation_list(const char *const roomjid, const char *const affi } void -ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) +mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) { ProfWin *window = (ProfWin*) mucwin; GSList *occupants = muc_occupants_by_affiliation(mucwin->roomjid, affiliation); diff --git a/src/ui/ui.h b/src/ui/ui.h index b138386d..10cc66e2 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -113,7 +113,7 @@ 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 ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation); +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); void ui_room_destroyed(const char *const roomjid, const char *const reason, const char *const new_jid, diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 5275648e..1814c807 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -213,7 +213,7 @@ 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 ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation) {} +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) {} void ui_room_destroyed(const char * const roomjid, const char * const reason, const char * const new_jid,