Mercurial > pidgin3 / changeset

--- a/libpurple/conversations.c	Thu May 22 16:57:07 2014 +0200
+++ b/libpurple/conversations.c	Thu May 22 17:10:34 2014 +0200
@@ -309,7 +309,7 @@
 		2, PURPLE_TYPE_ACCOUNT, PURPLE_TYPE_MESSAGE);
 
 	purple_signal_register(handle, "sent-im-msg",
-		purple_marshal_VOID__POINTER_POINTER_POINTER, G_TYPE_NONE,
+		purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE,
 		2, PURPLE_TYPE_ACCOUNT, PURPLE_TYPE_MESSAGE);
 
 	purple_signal_register(handle, "receiving-im-msg",

--- a/libpurple/sound.c	Thu May 22 16:57:07 2014 +0200
+++ b/libpurple/sound.c	Thu May 22 17:10:34 2014 +0200
@@ -81,6 +81,8 @@
 	if (!purple_sound_play_required(account))
 		return;
 
+	g_return_if_fail(event < PURPLE_NUM_SOUNDS);
+
 	if (time(NULL) - last_played[event] < 2)
 		return;
 	last_played[event] = time(NULL);

--- a/pidgin/gtksound.c	Thu May 22 16:57:07 2014 +0200
+++ b/pidgin/gtksound.c	Thu May 22 17:10:34 2014 +0200
@@ -110,6 +110,8 @@
 static void
 play_conv_event(PurpleConversation *conv, PurpleSoundEventID event)
 {
+	g_return_if_fail(event < PURPLE_NUM_SOUNDS);
+
 	/* If we should not play the sound for some reason, then exit early */
 	if (conv != NULL && PIDGIN_IS_PIDGIN_CONVERSATION(conv))
 	{