gst/gstelement.c: There's no need to warn if VOID_PENDING is not NONE here, as long...

Original commit message from CVS:
* gst/gstelement.c: (gst_element_dispose):
There's no need to warn if VOID_PENDING is not NONE here, as
long as the state is NULL it's ok, and that's checked immediately
above.

diff --git a/ChangeLog b/ChangeLog
index e5f43c5..5bae8c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-09  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * gst/gstelement.c: (gst_element_dispose):
+       There's no need to warn if VOID_PENDING is not NONE here, as
+       long as the state is NULL it's ok, and that's checked immediately
+       above.
+
 2007-03-08  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
        * plugins/elements/gstidentity.c: (gst_identity_check_perfect):

diff --git a/gst/gstelement.c b/gst/gstelement.c
index 0d25557..be458ca 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -2581,8 +2581,6 @@ gst_element_dispose (GObject * object)
   if (GST_STATE (element) != GST_STATE_NULL)
     goto not_null;
 
-  g_return_if_fail (GST_STATE_PENDING (element) == GST_STATE_VOID_PENDING);
-
   GST_DEBUG_OBJECT (element, "removing %d pads", g_list_length (element->pads));
   /* first we break all our links with the outside */
   while (element->pads && element->pads->data) {