# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1187899380 0
# Node ID 3bc55836f6214086052c21da4243fdc6e2935ba3
# Parent  8d9913d9fe5a031b42ec9cca73dbf4665f1771e5# Parent  630938110521df120851c8312f2fb71dbb1a71f7
merge of '89cc984f2585fa88cdf28e01b480be7cb0811788'
     and '8a8af8bea84774dd39079f4f90afc45d2663c58b'

diff -r 8d9913d9fe5a -r 3bc55836f621 finch/gntsound.c
--- a/finch/gntsound.c	Thu Aug 23 18:34:31 2007 +0000
+++ b/finch/gntsound.c	Thu Aug 23 20:03:00 2007 +0000
@@ -409,14 +409,14 @@
 	GError *err = NULL;
 
 	switch (GST_MESSAGE_TYPE (msg)) {
-	case GST_MESSAGE_EOS:
-		gst_element_set_state(play, GST_STATE_NULL);
-		gst_object_unref(GST_OBJECT(play));
-		break;
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error(msg, &err, NULL);
 		purple_debug_error("gstreamer", "%s\n", err->message);
 		g_error_free(err);
+		/* fall-through and clean up */
+	case GST_MESSAGE_EOS:
+		gst_element_set_state(play, GST_STATE_NULL);
+		gst_object_unref(GST_OBJECT(play));
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);
diff -r 8d9913d9fe5a -r 3bc55836f621 pidgin/gtksound.c
--- a/pidgin/gtksound.c	Thu Aug 23 18:34:31 2007 +0000
+++ b/pidgin/gtksound.c	Thu Aug 23 20:03:00 2007 +0000
@@ -364,14 +364,14 @@
 	GError *err = NULL;
 
 	switch (GST_MESSAGE_TYPE (msg)) {
-	case GST_MESSAGE_EOS:
-		gst_element_set_state(play, GST_STATE_NULL);
-		gst_object_unref(GST_OBJECT(play));
-		break;
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error(msg, &err, NULL);
 		purple_debug_error("gstreamer", "%s\n", err->message);
 		g_error_free(err);
+		/* fall-through and clean up */
+	case GST_MESSAGE_EOS:
+		gst_element_set_state(play, GST_STATE_NULL);
+		gst_object_unref(GST_OBJECT(play));
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);