aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

mucwin_show_occupants takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-02 00:59:27 +00:00
parent ce0763e160
commit 668f92ece2
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/commands.c
View File

@ -3173,7 +3173,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args)
mucwin->showjid = TRUE; mucwin->showjid = TRUE;
mucwin_update_occupants(mucwin); mucwin_update_occupants(mucwin);
} else { } else {
mucwin_show_occupants(mucwin->roomjid); mucwin_show_occupants(mucwin);
} }
} else if (g_strcmp0(args[0], "hide") == 0) { } else if (g_strcmp0(args[0], "hide") == 0) {
if (g_strcmp0(args[1], "jid") == 0) { if (g_strcmp0(args[1], "jid") == 0) {

2
src/ui/core.c
View File

@ -668,7 +668,7 @@ ui_show_all_room_rosters(void)
if (window->type == WIN_MUC && !win_has_active_subwin(window)) { if (window->type == WIN_MUC && !win_has_active_subwin(window)) {
ProfMucWin *mucwin = (ProfMucWin*)window; ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
mucwin_show_occupants(mucwin->roomjid); mucwin_show_occupants(mucwin);
} }
curr = g_list_next(curr); curr = g_list_next(curr);
} }

10
src/ui/mucwin.c
View File

@ -761,12 +761,14 @@ mucwin_update_occupants(ProfMucWin *mucwin)
} }
void void
mucwin_show_occupants(const char *const roomjid) mucwin_show_occupants(ProfMucWin *mucwin)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); assert(mucwin != NULL);
if (window && !win_has_active_subwin(window)) {
ProfWin *window = (ProfWin*)mucwin;
if (!win_has_active_subwin(window)) {
wins_show_subwin(window); wins_show_subwin(window);
occupantswin_occupants(roomjid); occupantswin_occupants(mucwin->roomjid);
} }
} }

2
src/ui/ui.h
View File

@ -195,7 +195,7 @@ void mucwin_nick_change(ProfMucWin *mucwin, const char *const nick);
void mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick, const char *const show, void mucwin_occupant_presence(ProfMucWin *mucwin, const char *const nick, const char *const show,
const char *const status); const char *const status);
void mucwin_update_occupants(ProfMucWin *mucwin); void mucwin_update_occupants(ProfMucWin *mucwin);
void mucwin_show_occupants(const char *const roomjid); void mucwin_show_occupants(ProfMucWin *mucwin);
void mucwin_hide_occupants(const char *const roomjid); void mucwin_hide_occupants(const char *const roomjid);
void mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation, const char *const error); void mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation, const char *const error);
void mucwin_handle_affiliation_list(ProfMucWin *mucwin, const char *const affiliation, GSList *jids); void mucwin_handle_affiliation_list(ProfMucWin *mucwin, const char *const affiliation, GSList *jids);

2
tests/unittests/ui/stub_ui.c
View File

@ -232,7 +232,7 @@ void mucwin_nick_change(ProfMucWin *mucwin, const char * const nick) {}
void mucwin_occupant_presence(ProfMucWin *mucwin, const char * const nick, const char * const show, void mucwin_occupant_presence(ProfMucWin *mucwin, const char * const nick, const char * const show,
const char * const status) {} const char * const status) {}
void mucwin_update_occupants(ProfMucWin *mucwin) {} void mucwin_update_occupants(ProfMucWin *mucwin) {}
void mucwin_show_occupants(const char * const roomjid) {} void mucwin_show_occupants(ProfMucWin *mucwin) {}
void mucwin_hide_occupants(const char * const roomjid) {} void mucwin_hide_occupants(const char * const roomjid) {}
void ui_show_roster(void) {} void ui_show_roster(void) {}
void ui_hide_roster(void) {} void ui_hide_roster(void) {}