Mercurial > pidgin
comparison finch/gntsound.c @ 32819:2c6510167895 default tip
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24)
to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 02 Jun 2012 02:30:49 +0000 |
parents | 1d09b9077181 |
children |
comparison
equal
deleted
inserted
replaced
32818:01ff09d4a463 | 32819:2c6510167895 |
---|---|
148 chat = purple_conversation_get_chat_data(conv); | 148 chat = purple_conversation_get_chat_data(conv); |
149 if (chat == NULL) | 149 if (chat == NULL) |
150 return ret; | 150 return ret; |
151 | 151 |
152 account = purple_conversation_get_account(conv); | 152 account = purple_conversation_get_account(conv); |
153 nick = g_strdup(purple_normalize(account, chat->nick)); | 153 nick = g_strdup(purple_normalize(account, purple_conv_chat_get_nick(chat))); |
154 name = g_strdup(purple_normalize(account, aname)); | 154 name = g_strdup(purple_normalize(account, aname)); |
155 | 155 |
156 if (g_utf8_collate(nick, name) == 0) | 156 if (g_utf8_collate(nick, name) == 0) |
157 ret = TRUE; | 157 ret = TRUE; |
158 | 158 |
266 return; | 266 return; |
267 | 267 |
268 if (chat_nick_matches_name(conv, sender)) | 268 if (chat_nick_matches_name(conv, sender)) |
269 return; | 269 return; |
270 | 270 |
271 if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, chat->nick)) | 271 if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, purple_conv_chat_get_nick(chat))) |
272 play_conv_event(conv, PURPLE_SOUND_CHAT_NICK); | 272 play_conv_event(conv, PURPLE_SOUND_CHAT_NICK); |
273 else | 273 else |
274 play_conv_event(conv, event); | 274 play_conv_event(conv, event); |
275 } | 275 } |
276 | 276 |