mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
mucwin_occupant_online takes ProfMucWin
This commit is contained in:
parent
3a98bf315c
commit
d505a92d1e
@ -646,8 +646,9 @@ sv_ev_muc_occupant_online(const char *const room, const char *const nick, const
|
||||
// joined room
|
||||
if (!occupant) {
|
||||
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
|
||||
if (g_strcmp0(muc_status_pref, "none") != 0) {
|
||||
mucwin_occupant_online(room, nick, role, affiliation, show, status);
|
||||
ProfMucWin *mucwin = wins_get_muc(room);
|
||||
if (mucwin && g_strcmp0(muc_status_pref, "none") != 0) {
|
||||
mucwin_occupant_online(mucwin, nick, role, affiliation, show, status);
|
||||
}
|
||||
prefs_free_string(muc_status_pref);
|
||||
occupantswin_occupants(room);
|
||||
|
@ -285,13 +285,12 @@ mucwin_occupant_banned(ProfMucWin *mucwin, const char *const nick, const char *c
|
||||
}
|
||||
|
||||
void
|
||||
mucwin_occupant_online(const char *const roomjid, const char *const nick, const char *const role,
|
||||
mucwin_occupant_online(ProfMucWin *mucwin, const char *const nick, const char *const role,
|
||||
const char *const affiliation, const char *const show, const char *const status)
|
||||
{
|
||||
ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
|
||||
if (window == NULL) {
|
||||
log_error("Received online presence for room participant %s, but no window open for %s.", nick, roomjid);
|
||||
} else {
|
||||
assert(mucwin != NULL);
|
||||
|
||||
ProfWin *window = (ProfWin*)mucwin;
|
||||
win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ONLINE, "", "-> %s has joined the room", nick);
|
||||
if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) {
|
||||
if (role) {
|
||||
@ -303,7 +302,6 @@ mucwin_occupant_online(const char *const roomjid, const char *const nick, const
|
||||
}
|
||||
win_print(window, '!', 0, NULL, NO_DATE, THEME_ROOMINFO, "", "");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
mucwin_occupant_presence(const char *const roomjid, const char *const nick,
|
||||
|
@ -189,7 +189,7 @@ void mucwin_occupant_banned(ProfMucWin *mucwin, const char *const nick, const ch
|
||||
const char *const reason);
|
||||
void mucwin_broadcast(const char *const roomjid, const char *const message);
|
||||
void mucwin_occupant_offline(ProfMucWin *mucwin, const char *const nick);
|
||||
void mucwin_occupant_online(const char *const roomjid, const char *const nick, const char *const roles,
|
||||
void mucwin_occupant_online(ProfMucWin *mucwin, const char *const nick, const char *const roles,
|
||||
const char *const affiliation, const char *const show, const char *const status);
|
||||
void mucwin_occupant_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick);
|
||||
void mucwin_nick_change(const char *const roomjid, const char *const nick);
|
||||
|
@ -228,7 +228,7 @@ void ui_leave_room(const char * const roomjid) {}
|
||||
void mucwin_broadcast(const char * const roomjid,
|
||||
const char * const message) {}
|
||||
void mucwin_occupant_offline(ProfMucWin *mucwin, const char * const nick) {}
|
||||
void mucwin_occupant_online(const char * const roomjid, const char * const nick, const char * const roles,
|
||||
void mucwin_occupant_online(ProfMucWin *mucwin, const char * const nick, const char * const roles,
|
||||
const char * const affiliation, const char * const show, const char * const status) {}
|
||||
void mucwin_occupant_nick_change(const char * const roomjid,
|
||||
const char * const old_nick, const char * const nick) {}
|
||||
|
Loading…
Reference in New Issue
Block a user