From ea8e39aa433d0e956dc6114d69ac950f0343b02d Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 1 Nov 2004 11:02:31 +0000 Subject: ext/esd/esdsink.c: Use a finalize function, not dispose, and more importantly, call the parent class finalize functio... Original commit message from CVS: * ext/esd/esdsink.c: (gst_esdsink_class_init), (gst_esdsink_finalize): Use a finalize function, not dispose, and more importantly, call the parent class finalize function too --- ext/esd/esdsink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ext/esd') diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index f8732f8e..c9294424 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -68,7 +68,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", static void gst_esdsink_base_init (gpointer g_class); static void gst_esdsink_class_init (gpointer g_class, gpointer class_data); static void gst_esdsink_init (GTypeInstance * instance, gpointer g_class); -static void gst_esdsink_dispose (GObject * object); +static void gst_esdsink_finalize (GObject * object); static gboolean gst_esdsink_open_audio (GstEsdsink * sink); static void gst_esdsink_close_audio (GstEsdsink * sink); @@ -146,7 +146,7 @@ gst_esdsink_class_init (gpointer g_class, gpointer class_data) gobject_class->set_property = gst_esdsink_set_property; gobject_class->get_property = gst_esdsink_get_property; - gobject_class->dispose = gst_esdsink_dispose; + gobject_class->finalize = gst_esdsink_finalize; gstelement_class->change_state = gst_esdsink_change_state; gstelement_class->set_clock = gst_esdsink_set_clock; @@ -189,11 +189,13 @@ gst_esdsink_init (GTypeInstance * instance, gpointer g_class) } static void -gst_esdsink_dispose (GObject * object) +gst_esdsink_finalize (GObject * object) { GstEsdsink *esdsink = GST_ESDSINK (object); g_free (esdsink->host); + + G_OBJECT_CLASS (parent_class)->finalize (object); } #ifdef unused -- cgit