# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1141694379 0
# Node ID d931946136965d12243dcb2a1643ee85d2b39611
# Parent  0d223f4ee8686ae403c19ce6de64d82c983f7f02
[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>

diff -r 0d223f4ee868 -r d93194613696 src/gtksound.c
--- a/src/gtksound.c	Tue Mar 07 01:12:13 2006 +0000
+++ b/src/gtksound.c	Tue Mar 07 01:19:39 2006 +0000
@@ -207,8 +207,9 @@
 		return;
 
 	chat = gaim_conversation_get_chat_data(conv);
+	g_return_if_fail(chat != NULL);
 
-	if (chat!=NULL && gaim_conv_chat_is_user_ignored(chat, sender))
+	if (gaim_conv_chat_is_user_ignored(chat, sender))
 		return;
 
 	if (chat_nick_matches_name(conv, sender))