changeset
merge of 'f7931803273a13aa1a93fb36ff187329051b7788'
Thu, 23 Aug 2007 20:03:00 +0000
- author
- Sean Egan <seanegan@pidgin.im>
- date
- Thu, 23 Aug 2007 20:03:00 +0000
- changeset 19565
- b6baa14887a8
- parent 19562
- f7931803273a (current diff)
- parent 19564
- 6f04c6ab2897 (diff)
- child 19566
- 8d4f4a4dfad4
- child 19568
- 1daa0179da7b
merge of 'f7931803273a13aa1a93fb36ff187329051b7788'
and '6f04c6ab2897575184a178ea34dc101650314772'
--- 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);
--- 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);
