check/generic/states.c: Cleanup can be done at the end.

Original commit message from CVS:
* check/generic/states.c: (GST_START_TEST):
Cleanup can be done at the end.

* gst/gsttask.c: (gst_task_get_type), (gst_task_finalize),
(gst_task_func), (gst_task_cleanup_all), (gst_task_set_lock),
(gst_task_get_state), (gst_task_start), (gst_task_pause):
Oh boy.. Thanks for finding this, Thomas.

diff --git a/ChangeLog b/ChangeLog
index bcdc859..7fa142b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-25  Wim Taymans  <wim@fluendo.com>
+
+       * check/generic/states.c: (GST_START_TEST):
+       Cleanup can be done at the end.
+
+       * gst/gsttask.c: (gst_task_get_type), (gst_task_finalize),
+       (gst_task_func), (gst_task_cleanup_all), (gst_task_set_lock),
+       (gst_task_get_state), (gst_task_start), (gst_task_pause):
+       Oh boy.. Thanks for finding this, Thomas. 
+
 2005-08-25  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/gst/gstreamer.types:

diff --git a/check/generic/states.c b/check/generic/states.c
index a441686..41d8fba 100644 (file)
--- a/check/generic/states.c
+++ b/check/generic/states.c
@@ -50,9 +50,8 @@ GST_START_TEST (test_state_changes)
     gst_element_set_state (element, GST_STATE_PAUSED);
     gst_element_set_state (element, GST_STATE_NULL);
     gst_object_unref (GST_OBJECT (element));
-
-    gst_task_cleanup_all ();
   }
+  gst_task_cleanup_all ();
 }
 
 GST_END_TEST;

diff --git a/gst/gsttask.c b/gst/gsttask.c
index 23de33f..7fb0739 100644 (file)
--- a/gst/gsttask.c
+++ b/gst/gsttask.c
@@ -99,7 +99,7 @@ gst_task_finalize (GObject * object)
   g_cond_free (task->cond);
   task->cond = NULL;
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void

diff --git a/tests/check/generic/states.c b/tests/check/generic/states.c
index a441686..41d8fba 100644 (file)
--- a/tests/check/generic/states.c
+++ b/tests/check/generic/states.c
@@ -50,9 +50,8 @@ GST_START_TEST (test_state_changes)
     gst_element_set_state (element, GST_STATE_PAUSED);
     gst_element_set_state (element, GST_STATE_NULL);
     gst_object_unref (GST_OBJECT (element));
-
-    gst_task_cleanup_all ();
   }
+  gst_task_cleanup_all ();
 }
 
 GST_END_TEST;