From 22cd5b433f90446066de0f63fbefe89bda1b0abb Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Nov 2015 23:10:07 +0000 Subject: Tidy sv_ev_muc_self_online --- src/event/server_events.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/event/server_events.c') diff --git a/src/event/server_events.c b/src/event/server_events.c index acfa0c4f..3982f14c 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -585,27 +585,19 @@ sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean c // check for change in role/affiliation } else { - if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) { + ProfMucWin *mucwin = wins_get_muc(room); + if (mucwin && prefs_get_boolean(PREF_MUC_PRIVILEGES)) { // both changed if ((g_strcmp0(role, old_role) != 0) && (g_strcmp0(affiliation, old_affiliation) != 0)) { - ProfMucWin *mucwin = wins_get_muc(room); - if (mucwin) { - mucwin_role_and_affiliation_change(mucwin, role, affiliation, actor, reason); - } + mucwin_role_and_affiliation_change(mucwin, role, affiliation, actor, reason); // role changed } else if (g_strcmp0(role, old_role) != 0) { - ProfMucWin *mucwin = wins_get_muc(room); - if (mucwin) { - mucwin_role_change(mucwin, role, actor, reason); - } + mucwin_role_change(mucwin, role, actor, reason); // affiliation changed } else if (g_strcmp0(affiliation, old_affiliation) != 0) { - ProfMucWin *mucwin = wins_get_muc(room); - if (mucwin) { - mucwin_affiliation_change(mucwin, affiliation, actor, reason); - } + mucwin_affiliation_change(mucwin, affiliation, actor, reason); } } } -- cgit 1.4.1-2-gfad0