empathy r2102 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jan  6 16:50:05 2009
New Revision: 2102
URL: http://svn.gnome.org/viewvc/empathy?rev=2102&view=rev

Log:
Sanity checks for empathy_play_sounds.

Modified:
   trunk/libempathy-gtk/empathy-ui-utils.c

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Tue Jan  6 16:50:05 2009
@@ -1566,7 +1566,8 @@
 	EmpathySoundEntry *entry = &(sound_entries[sound_id]);
 	gboolean should_play = TRUE;
 
-	g_assert (entry->sound_id == sound_id);
+	g_return_if_fail (entry->sound_id < LAST_EMPATHY_SOUND);
+	g_return_if_fail (entry->sound_id == sound_id);
 
 	if (entry->gconf_key != NULL) {
 		should_play = empathy_sound_pref_is_enabled (entry->gconf_key);