pidgin: 2e8917cc: Fix fallback to default sounds when the ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 2e8917ccda7f557d10ad1fb19e35dd3ac5cc7698
Ancestor: 68f3a9f4807ebc5f947b2948ca0623d75d322134
Author: datallah at pidgin.im
Date: 2009-09-15T03:58:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2e8917ccda7f557d10ad1fb19e35dd3ac5cc7698

Modified files:
        pidgin/gtksound.c

ChangeLog: 

Fix fallback to default sounds when the file isn't found.

-------------- next part --------------
============================================================
--- pidgin/gtksound.c	cd624de6ad8a8ee939cb4ab161704955d65ad7c9
+++ pidgin/gtksound.c	b337a77cea04b987c3dab2ae2762ce50efd5518d
@@ -212,6 +212,8 @@ chat_msg_received_cb(PurpleAccount *acco
 		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 @@ pidgin_sound_play_event(PurpleSoundEvent
 				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;
 			}
 		}