comparison: src/conversation.c
src/conversation.c
- changeset 10955
- 66420fe2475e
- parent 10849
- 476d68d7a435
- child 10958
- 08909921daa1
equal
deleted
inserted
replaced
| 10954:cd5771cb6cf8 | 10955:66420fe2475e |
|---|---|
| 1918 | 1918 |
| 1919 conv = gaim_conv_chat_get_conversation(chat); | 1919 conv = gaim_conv_chat_get_conversation(chat); |
| 1920 ops = gaim_conversation_get_ui_ops(conv); | 1920 ops = gaim_conversation_get_ui_ops(conv); |
| 1921 | 1921 |
| 1922 quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), | 1922 quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), |
| 1923 "chat-buddy-joining", conv, user, flags)); | 1923 "chat-buddy-joining", conv, user, flags)) | |
| 1924 gaim_conv_chat_is_user_ignored(chat, user); | |
| 1924 | 1925 |
| 1925 cb = gaim_conv_chat_cb_new(user, flags); | 1926 cb = gaim_conv_chat_cb_new(user, flags); |
| 1926 | 1927 |
| 1927 gaim_conv_chat_set_users(chat, | 1928 gaim_conv_chat_set_users(chat, |
| 1928 g_list_append(gaim_conv_chat_get_users(chat), cb)); | 1929 g_list_append(gaim_conv_chat_get_users(chat), cb)); |
| 2026 if(!g_utf8_collate(old_user, chat->nick)) { | 2027 if(!g_utf8_collate(old_user, chat->nick)) { |
| 2027 gaim_conv_chat_set_nick(chat, new_user); | 2028 gaim_conv_chat_set_nick(chat, new_user); |
| 2028 its_me = TRUE; | 2029 its_me = TRUE; |
| 2029 } | 2030 } |
| 2030 | 2031 |
| 2031 if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change")) { | 2032 if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change") || |
| 2033 gaim_conv_chat_is_user_ignored(chat, new_user)) { | |
| 2032 if(its_me) { | 2034 if(its_me) { |
| 2033 g_snprintf(tmp, sizeof(tmp), | 2035 g_snprintf(tmp, sizeof(tmp), |
| 2034 _("You are now known as %s"), new_user); | 2036 _("You are now known as %s"), new_user); |
| 2035 } else { | 2037 } else { |
| 2036 g_snprintf(tmp, sizeof(tmp), | 2038 g_snprintf(tmp, sizeof(tmp), |
| 2055 | 2057 |
| 2056 conv = gaim_conv_chat_get_conversation(chat); | 2058 conv = gaim_conv_chat_get_conversation(chat); |
| 2057 ops = gaim_conversation_get_ui_ops(conv); | 2059 ops = gaim_conversation_get_ui_ops(conv); |
| 2058 | 2060 |
| 2059 quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), | 2061 quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), |
| 2060 "chat-buddy-leaving", conv, user, reason)); | 2062 "chat-buddy-leaving", conv, user, reason)) | |
| 2063 gaim_conv_chat_is_user_ignored(chat, user); | |
| 2061 | 2064 |
| 2062 if (ops != NULL && ops->chat_remove_user != NULL) | 2065 if (ops != NULL && ops->chat_remove_user != NULL) |
| 2063 ops->chat_remove_user(conv, user); | 2066 ops->chat_remove_user(conv, user); |
| 2064 | 2067 |
| 2065 cb = gaim_conv_chat_cb_find(chat, user); | 2068 cb = gaim_conv_chat_cb_find(chat, user); |
