gaim/gaim

sf patch #1210535, from Levi Bard
oldstatus
2005-05-31, Mark Doliner
6800b76ff0ce
Parents 35f034711a36
Children 3dddf2155759
sf patch #1210535, from Levi Bard
Drops enter/leave/name change messages for ignored users
3 files changed, 17 insertions(+), 9 deletions(-)
  • +1 -0
    COPYRIGHT
  • +0 -1
    plugins/autorecon.c
  • +16 -8
    src/conversation.c
    • --- a/COPYRIGHT Fri May 27 20:11:12 2005 -0400
    +++ b/COPYRIGHT Tue May 31 20:19:26 2005 -0400
    @@ -9,6 +9,7 @@
    Daniel Atallah
    Paul Aurich
    Patrick Aussems
    +Levi Bard
    Kevin Barry
    Derek Battams
    Curtis Beattie
    --- a/plugins/autorecon.c Fri May 27 20:11:12 2005 -0400
    +++ b/plugins/autorecon.c Tue May 31 20:19:26 2005 -0400
    @@ -140,7 +140,6 @@
    /* Restore the state to what it was before the disconnect */
    GaimAwayState *state;
    GaimAccount *account;
    - GaimAutoRecon *recon;
    g_return_if_fail(gc != NULL);
    account = gaim_connection_get_account(gc);
    --- a/src/conversation.c Fri May 27 20:11:12 2005 -0400
    +++ b/src/conversation.c Tue May 31 20:19:26 2005 -0400
    @@ -2022,7 +2022,8 @@
    ops = gaim_conversation_get_ui_ops(conv);
    quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(),
    - "chat-buddy-joining", conv, user, flags));
    + "chat-buddy-joining", conv, user, flags)) ||
    + gaim_conv_chat_is_user_ignored(chat, user);
    cb = gaim_conv_chat_cb_new(user, flags);
    @@ -2130,7 +2131,9 @@
    its_me = TRUE;
    }
    - if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change")) {
    + if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change") ||
    + gaim_conv_chat_is_user_ignored(chat, new_user))
    + {
    if(its_me) {
    g_snprintf(tmp, sizeof(tmp),
    _("You are now known as %s"), new_user);
    @@ -2159,7 +2162,8 @@
    ops = gaim_conversation_get_ui_ops(conv);
    quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(),
    - "chat-buddy-leaving", conv, user, reason));
    + "chat-buddy-leaving", conv, user, reason)) ||
    + gaim_conv_chat_is_user_ignored(chat, user);
    if (ops != NULL && ops->chat_remove_user != NULL)
    ops->chat_remove_user(conv, user);
    @@ -2239,11 +2243,15 @@
    *tmp = '\0';
    - for (l = users, i = 0; i < max; i++, l = l->next) {
    - g_strlcat(tmp, (char *)l->data, sizeof(tmp));
    -
    - if (i < max - 1)
    - g_strlcat(tmp, ", ", sizeof(tmp));
    + for (l = users, i = 0; i < max; i++, l = l->next)
    + {
    + if (!gaim_conv_chat_is_user_ignored(chat, (char*)l->data))
    + {
    + g_strlcat(tmp, (char *)l->data, sizeof(tmp));
    +
    + if (i < max - 1)
    + g_strlcat(tmp, ", ", sizeof(tmp));
    + }
    }
    if (size > 10)