# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1252987139 0
# Node ID 08f8d45e3a14c962f7b10b5ddfae1e552bb83e35
# Parent  ddbb3a85d9d807d7f9faee646c993757d05023d8
Fix fallback to default sounds when the file isn't found.

diff -r ddbb3a85d9d8 -r 08f8d45e3a14 pidgin/gtksound.c
--- a/pidgin/gtksound.c	Tue Sep 15 02:43:59 2009 +0000
+++ b/pidgin/gtksound.c	Tue Sep 15 03:58:59 2009 +0000
@@ -212,6 +212,8 @@
 		return;
 
 	if (flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(message, chat->nick))
+		/* This isn't quite right; if you have the PURPLE_SOUND_CHAT_NICK event disabled
+		 * and the PURPLE_SOUND_CHAT_SAY event enabled, you won't get a sound at all */
 		play_conv_event(conv, PURPLE_SOUND_CHAT_NICK);
 	else
 		play_conv_event(conv, event);
@@ -591,6 +593,7 @@
 				purple_debug_error("sound", "The file: (%s) %s\n from theme: %s, was not found or wasn't readable\n",
 							sounds[event].pref, filename, theme_name);
 				g_free(filename);
+				filename = NULL;
 			}
 		}