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_update_occupants takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-02 00:57:13 +00:00
parent 6c2617ccda
commit ce0763e160
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/commands.c
View File

@ -3171,14 +3171,14 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args)
if (g_strcmp0(args[0], "show") == 0) { if (g_strcmp0(args[0], "show") == 0) {
if (g_strcmp0(args[1], "jid") == 0) { if (g_strcmp0(args[1], "jid") == 0) {
mucwin->showjid = TRUE; mucwin->showjid = TRUE;
mucwin_update_occupants(mucwin->roomjid); mucwin_update_occupants(mucwin);
} else { } else {
mucwin_show_occupants(mucwin->roomjid); mucwin_show_occupants(mucwin->roomjid);
} }
} 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) {
mucwin->showjid = FALSE; mucwin->showjid = FALSE;
mucwin_update_occupants(mucwin->roomjid); mucwin_update_occupants(mucwin);
} else { } else {
mucwin_hide_occupants(mucwin->roomjid); mucwin_hide_occupants(mucwin->roomjid);
} }

10
src/ui/mucwin.c
View File

@ -750,11 +750,13 @@ mucwin_info(ProfMucWin *mucwin)
} }
void void
mucwin_update_occupants(const char *const roomjid) mucwin_update_occupants(ProfMucWin *mucwin)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); assert(mucwin != NULL);
if (window && win_has_active_subwin(window)) {
occupantswin_occupants(roomjid); ProfWin *window = (ProfWin*)mucwin;
if (win_has_active_subwin(window)) {
occupantswin_occupants(mucwin->roomjid);
} }
} }

2
src/ui/ui.h
View File

@ -194,7 +194,7 @@ void mucwin_occupant_nick_change(ProfMucWin *mucwin, const char *const old_nick,
void mucwin_nick_change(ProfMucWin *mucwin, const char *const nick); 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(const char *const roomjid); void mucwin_update_occupants(ProfMucWin *mucwin);
void mucwin_show_occupants(const char *const roomjid); void mucwin_show_occupants(const char *const roomjid);
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);

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

@ -231,7 +231,7 @@ void mucwin_occupant_nick_change(ProfMucWin *mucwin, const char * const old_nick
void mucwin_nick_change(ProfMucWin *mucwin, const char * const nick) {} 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(const char * const roomjid) {} void mucwin_update_occupants(ProfMucWin *mucwin) {}
void mucwin_show_occupants(const char * const roomjid) {} void mucwin_show_occupants(const char * const roomjid) {}
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) {}