From a42fda42abad6af64ac9a905856ee9a3095954cd Mon Sep 17 00:00:00 2001 From: dequis Date: Tue, 8 Dec 2015 19:31:05 -0300 Subject: Add imcb_buddy_nick_change(), like nick_hint but stronger nick_hint only works when creating new users, it's a no-op after the user is online. This new function takes care of nick changes after that. It also helps clean up couple of hacks in irc_im.c \o/ --- irc_im.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) (limited to 'irc_im.c') diff --git a/irc_im.c b/irc_im.c index 3b049462..614819dd 100644 --- a/irc_im.c +++ b/irc_im.c @@ -341,7 +341,7 @@ static gboolean bee_irc_user_action_response(bee_t *bee, bee_user_t *bu, const c return TRUE; } -static gboolean bee_irc_user_nick_update(irc_user_t *iu); +static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only); static gboolean bee_irc_user_fullname(bee_t *bee, bee_user_t *bu) { @@ -369,14 +369,21 @@ static gboolean bee_irc_user_fullname(bee_t *bee, bee_user_t *bu) imcb_log(bu->ic, "User `%s' changed name to `%s'", iu->nick, iu->fullname); } - bee_irc_user_nick_update(iu); + bee_irc_user_nick_update(iu, TRUE); return TRUE; } static gboolean bee_irc_user_nick_hint(bee_t *bee, bee_user_t *bu, const char *hint) { - bee_irc_user_nick_update((irc_user_t *) bu->ui_data); + bee_irc_user_nick_update((irc_user_t *) bu->ui_data, TRUE); + + return TRUE; +} + +static gboolean bee_irc_user_nick_change(bee_t *bee, bee_user_t *bu, const char *nick) +{ + bee_irc_user_nick_update((irc_user_t *) bu->ui_data, FALSE); return TRUE; } @@ -385,30 +392,19 @@ static gboolean bee_irc_user_group(bee_t *bee, bee_user_t *bu) { irc_user_t *iu = (irc_user_t *) bu->ui_data; irc_t *irc = (irc_t *) bee->ui_data; - bee_user_flags_t online; - - /* Take the user offline temporarily so we can change the nick (if necessary). */ - if ((online = bu->flags & BEE_USER_ONLINE)) { - bu->flags &= ~BEE_USER_ONLINE; - } bee_irc_channel_update(irc, NULL, iu); - bee_irc_user_nick_update(iu); - - if (online) { - bu->flags |= online; - bee_irc_channel_update(irc, NULL, iu); - } + bee_irc_user_nick_update(iu, FALSE); return TRUE; } -static gboolean bee_irc_user_nick_update(irc_user_t *iu) +static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only) { bee_user_t *bu = iu->bu; char *newnick; - if (bu->flags & BEE_USER_ONLINE) { + if (offline_only && bu->flags & BEE_USER_ONLINE) { /* Ignore if the user is visible already. */ return TRUE; } @@ -431,21 +427,14 @@ static gboolean bee_irc_user_nick_update(irc_user_t *iu) void bee_irc_user_nick_reset(irc_user_t *iu) { bee_user_t *bu = iu->bu; - bee_user_flags_t online; if (bu == FALSE) { return; } - /* In this case, pretend the user is offline. */ - if ((online = bu->flags & BEE_USER_ONLINE)) { - bu->flags &= ~BEE_USER_ONLINE; - } - nick_del(bu); - bee_irc_user_nick_update(iu); + bee_irc_user_nick_update(iu, FALSE); - bu->flags |= online; } /* IRC->IM calls */ @@ -1145,4 +1134,5 @@ const struct bee_ui_funcs irc_ui_funcs = { bee_irc_ft_finished, bee_irc_log, + bee_irc_user_nick_change, }; -- cgit v1.2.3