diff --git a/src/command/commands.c b/src/command/commands.c index 514ddce8..9c966dd8 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -3173,7 +3173,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) mucwin->showjid = TRUE; mucwin_update_occupants(mucwin->roomjid); } else { - ui_room_show_occupants(mucwin->roomjid); + mucwin_occupants(mucwin->roomjid); } } else if (g_strcmp0(args[0], "hide") == 0) { if (g_strcmp0(args[1], "jid") == 0) { diff --git a/src/ui/core.c b/src/ui/core.c index 6fcfc8f5..458b05df 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -668,7 +668,7 @@ ui_show_all_room_rosters(void) if (window->type == WIN_MUC && !win_has_active_subwin(window)) { ProfMucWin *mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - ui_room_show_occupants(mucwin->roomjid); + mucwin_occupants(mucwin->roomjid); } curr = g_list_next(curr); } diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index 9d13a799..d65048e7 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -777,7 +777,7 @@ mucwin_update_occupants(const char *const roomjid) } void -ui_room_show_occupants(const char *const roomjid) +mucwin_occupants(const char *const roomjid) { ProfWin *window = (ProfWin*)wins_get_muc(roomjid); if (window && !win_has_active_subwin(window)) { diff --git a/src/ui/ui.h b/src/ui/ui.h index e9d322a2..18bd0cea 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -134,7 +134,7 @@ 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 mucwin_update_occupants(const char *const roomjid); -void ui_room_show_occupants(const char *const roomjid); +void mucwin_occupants(const char *const roomjid); void ui_room_hide_occupants(const char *const roomjid); void ui_show_roster(void); void ui_hide_roster(void); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index ed082225..a1aacdc3 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -236,7 +236,7 @@ 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 mucwin_update_occupants(const char * const roomjid) {} -void ui_room_show_occupants(const char * const roomjid) {} +void mucwin_occupants(const char * const roomjid) {} void ui_room_hide_occupants(const char * const roomjid) {} void ui_show_roster(void) {} void ui_hide_roster(void) {}