# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1187902559 0
# Node ID 31d1143ac9ed52b19b055c5264035191fd291ad6
# Parent  3bc55836f6214086052c21da4243fdc6e2935ba3# Parent  7e70c8ba6bf4dcb3ebe6880097dec60c1a025ca8
merge of '64a21ba142d57ec69f4b25cf89b5e725ff2a4752'
     and 'b5e04374f6f6b3a7543c52514185b6d46e12bd7c'

diff -r 7e70c8ba6bf4 -r 31d1143ac9ed finch/gntsound.c
--- a/finch/gntsound.c	Thu Aug 23 20:54:30 2007 +0000
+++ b/finch/gntsound.c	Thu Aug 23 20:55:59 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 7e70c8ba6bf4 -r 31d1143ac9ed pidgin/gtksound.c
--- a/pidgin/gtksound.c	Thu Aug 23 20:54:30 2007 +0000
+++ b/pidgin/gtksound.c	Thu Aug 23 20:55:59 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);