Mercurial > pidgin

comparison pidgin/gtksound.c @ 32672:3828a61c44da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A boring and large patch so I can merge heads.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:21:58 +0000
parents a8cc50c2279f
children
comparison
equal deleted inserted replaced
32671:0e69949b3e61 32672:3828a61c44da
94 chat = purple_conversation_get_chat_data(conv); 94 chat = purple_conversation_get_chat_data(conv);
95 95
96 if (chat==NULL) 96 if (chat==NULL)
97 return ret; 97 return ret;
98 98
99 nick = g_strdup(purple_normalize(conv->account, chat->nick)); 99 nick = g_strdup(purple_normalize(purple_conversation_get_account(conv), purple_conv_chat_get_nick(chat)));
100 name = g_strdup(purple_normalize(conv->account, aname)); 100 name = g_strdup(purple_normalize(purple_conversation_get_account(conv), aname));
101 101
102 if (g_utf8_collate(nick, name) == 0) 102 if (g_utf8_collate(nick, name) == 0)
103 ret = TRUE; 103 ret = TRUE;
104 104
105 g_free(nick); 105 g_free(nick);
210 return; 210 return;
211 211
212 if (chat_nick_matches_name(conv, sender)) 212 if (chat_nick_matches_name(conv, sender))
213 return; 213 return;
214 214
215 if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, chat->nick)) 215 if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, purple_conv_chat_get_nick(chat)))
216 /* This isn't quite right; if you have the PURPLE_SOUND_CHAT_NICK event disabled 216 /* This isn't quite right; if you have the PURPLE_SOUND_CHAT_NICK event disabled
217 * and the PURPLE_SOUND_CHAT_SAY event enabled, you won't get a sound at all */ 217 * and the PURPLE_SOUND_CHAT_SAY event enabled, you won't get a sound at all */
218 play_conv_event(conv, PURPLE_SOUND_CHAT_NICK); 218 play_conv_event(conv, PURPLE_SOUND_CHAT_NICK);
219 else 219 else
220 play_conv_event(conv, event); 220 play_conv_event(conv, event);