Mercurial > pidgin
changeset 19385:3bc55836f621
merge of '89cc984f2585fa88cdf28e01b480be7cb0811788'
and '8a8af8bea84774dd39079f4f90afc45d2663c58b'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Thu, 23 Aug 2007 20:03:00 +0000 |
| parents | 8d9913d9fe5a (current diff) 630938110521 (diff) |
| children | 31d1143ac9ed 1c97caf1ebbb |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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);