Mercurial > pidgin
comparison finch/plugins/gntgf.c @ 32672:3828a61c44da
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 |
---|---|
166 | 166 |
167 if (purple_prefs_get_bool(PREFS_BEEP)) | 167 if (purple_prefs_get_bool(PREFS_BEEP)) |
168 beep(); | 168 beep(); |
169 | 169 |
170 if (conv != NULL) { | 170 if (conv != NULL) { |
171 FinchConv *fc = conv->ui_data; | 171 FinchConv *fc = FINCH_CONV(conv); |
172 if (gnt_widget_has_focus(fc->window)) | 172 if (gnt_widget_has_focus(fc->window)) |
173 return; | 173 return; |
174 } | 174 } |
175 | 175 |
176 #ifdef HAVE_X11 | 176 #ifdef HAVE_X11 |
254 const char *nick; | 254 const char *nick; |
255 | 255 |
256 if (flags & PURPLE_MESSAGE_WHISPER) | 256 if (flags & PURPLE_MESSAGE_WHISPER) |
257 return; | 257 return; |
258 | 258 |
259 nick = PURPLE_CONV_CHAT(conv)->nick; | 259 nick = purple_conv_chat_get_nick(PURPLE_CONV_CHAT(conv)); |
260 | 260 |
261 if (g_utf8_collate(sender, nick) == 0) | 261 if (g_utf8_collate(sender, nick) == 0) |
262 return; | 262 return; |
263 | 263 |
264 if (purple_prefs_get_bool(PREFS_EVENT_CHAT_NICK) && | 264 if (purple_prefs_get_bool(PREFS_EVENT_CHAT_NICK) && |