aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

mucwin_occupant_affiliation_change takes ProfMucWin

Browse Source
This commit is contained in:
James Booth 2015-11-01 23:14:27 +00:00
parent 288c1a9d6e
commit 799c064dff
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event/server_events.c
View File

@ -671,7 +671,10 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const
// affiliation changed // affiliation changed
} else if (g_strcmp0(affiliation, old_affiliation) != 0) { } else if (g_strcmp0(affiliation, old_affiliation) != 0) {
mucwin_occupant_affiliation_change(room, nick, affiliation, actor, reason); ProfMucWin *mucwin = wins_get_muc(room);
if (mucwin) {
mucwin_occupant_affiliation_change(mucwin, nick, affiliation, actor, reason);
}
} }
} }
occupantswin_occupants(room); occupantswin_occupants(room);

6
src/ui/mucwin.c
View File

@ -109,10 +109,12 @@ mucwin_occupant_role_change(ProfMucWin *mucwin, const char *const nick, const ch
} }
void void
mucwin_occupant_affiliation_change(const char *const roomjid, const char *const nick, const char *const affiliation, mucwin_occupant_affiliation_change(ProfMucWin *mucwin, const char *const nick, const char *const affiliation,
const char *const actor, const char *const reason) const char *const actor, const char *const reason)
{ {
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); assert(mucwin != NULL);
ProfWin *window = (ProfWin*)mucwin;
win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "%s's affiliation has been changed to: %s", nick, affiliation); win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "%s's affiliation has been changed to: %s", nick, affiliation);
if (actor) { if (actor) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", by: %s", actor); win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", by: %s", actor);

2
src/ui/ui.h
View File

@ -168,7 +168,7 @@ void mucwin_role_and_affiliation_change(ProfMucWin *mucwin, const char *const ro
const char *const affiliation, const char *const actor, const char *const reason); const char *const affiliation, const char *const actor, const char *const reason);
void mucwin_occupant_role_change(ProfMucWin *mucwin, const char *const nick, const char *const role, void mucwin_occupant_role_change(ProfMucWin *mucwin, const char *const nick, const char *const role,
const char *const actor, const char *const reason); const char *const actor, const char *const reason);
void mucwin_occupant_affiliation_change(const char *const roomjid, const char *const nick, void mucwin_occupant_affiliation_change(ProfMucWin *mucwin, const char *const nick,
const char *const affiliation, const char *const actor, const char *const reason); const char *const affiliation, const char *const actor, const char *const reason);
void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick, void mucwin_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick,
const char *const role, const char *const affiliation, const char *const actor, const char *const reason); const char *const role, const char *const affiliation, const char *const actor, const char *const reason);

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

@ -199,7 +199,7 @@ void mucwin_role_and_affiliation_change(ProfMucWin *mucwin, const char * const r
const char * const affiliation, const char * const actor, const char * const reason) {} const char * const affiliation, const char * const actor, const char * const reason) {}
void mucwin_occupant_role_change(ProfMucWin *mucwin, const char * const nick, const char * const role, void mucwin_occupant_role_change(ProfMucWin *mucwin, const char * const nick, const char * const role,
const char * const actor, const char * const reason) {} const char * const actor, const char * const reason) {}
void mucwin_occupant_affiliation_change(const char * const roomjid, const char * const nick, const char * const affiliation, void mucwin_occupant_affiliation_change(ProfMucWin *mucwin, const char * const nick, const char * const affiliation,
const char * const actor, const char * const reason) {} const char * const actor, const char * const reason) {}
void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role, void mucwin_occupant_role_and_affiliation_change(const char * const roomjid, const char * const nick, const char * const role,
const char * const affiliation, const char * const actor, const char * const reason) {} const char * const affiliation, const char * const actor, const char * const reason) {}