Mercurial > pidgin
comparison finch/plugins/gntgf.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 |
|---|---|
| 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) && |
