ext/esd/esdsink.c: Use a finalize function, not dispose, and more importantly, call...

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

diff --git a/ChangeLog b/ChangeLog
index 37f820a..4161257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-01  Jan Schmidt  <thaytan@mad.scientist.com>
+       * 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
+
 2004-11-01  Johan Dahlin  <johan@gnome.org>
 
        * ext/ogg/gstoggdemux.c:

diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index f8732f8..c929442 100644 (file)
--- 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