Mercurial > pidgin.yaz
comparison src/gtksound.c @ 13412:d93194613696
[gaim-migrate @ 15787]
If this function were called when conv is not a chat (which should never happen, as this is a signal callback for "received-chat-msg"), then the chat variable could be NULL. We dereference it later, so let's clean up the NULL guards here.
Resolves CID 13
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 07 Mar 2006 01:19:39 +0000 |
| parents | 1becdaf72e6d |
| children | d05d8bcabbfb |
comparison
equal
deleted
inserted
replaced
| 13411:0d223f4ee868 | 13412:d93194613696 |
|---|---|
| 205 | 205 |
| 206 if (flags & GAIM_MESSAGE_DELAYED) | 206 if (flags & GAIM_MESSAGE_DELAYED) |
| 207 return; | 207 return; |
| 208 | 208 |
| 209 chat = gaim_conversation_get_chat_data(conv); | 209 chat = gaim_conversation_get_chat_data(conv); |
| 210 | 210 g_return_if_fail(chat != NULL); |
| 211 if (chat!=NULL && gaim_conv_chat_is_user_ignored(chat, sender)) | 211 |
| 212 if (gaim_conv_chat_is_user_ignored(chat, sender)) | |
| 212 return; | 213 return; |
| 213 | 214 |
| 214 if (chat_nick_matches_name(conv, sender)) | 215 if (chat_nick_matches_name(conv, sender)) |
| 215 return; | 216 return; |
| 216 | 217 |