7 files changed, 25 insertions, 23 deletions
diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c
index 9bf7fddd..069191f4 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -83,7 +83,7 @@ enum
 
 static void gst_cdaudio_class_init (GstCDAudioClass * klass);
 static void gst_cdaudio_init (GstCDAudio * cdaudio);
-static void gst_cdaudio_dispose (GObject * object);
+static void gst_cdaudio_finalize (GObject * object);
 
 static void gst_cdaudio_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * spec);
@@ -185,7 +185,7 @@ gst_cdaudio_class_init (GstCDAudioClass * klass)
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstCDAudioClass, track_change), NULL,
       NULL, gst_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 
-  gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_cdaudio_dispose);
+  gobject_klass->finalize = GST_DEBUG_FUNCPTR (gst_cdaudio_finalize);
 
   gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_cdaudio_change_state);
   gstelement_klass->get_event_masks =
@@ -210,17 +210,14 @@ gst_cdaudio_init (GstCDAudio * cdaudio)
 }
 
 static void
-gst_cdaudio_dispose (GObject * object)
+gst_cdaudio_finalize (GObject * object)
 {
-  GstCDAudio *cdaudio;
+  GstCDAudio *cdaudio = GST_CDAUDIO (object);
 
-  cdaudio = GST_CDAUDIO (object);
   g_timer_destroy (cdaudio->timer);
   g_free (cdaudio->device);
 
-  if (G_OBJECT_CLASS (parent_class)->dispose) {
-    G_OBJECT_CLASS (parent_class)->dispose (object);
-  }
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 0a3e7ad8..543bff3f 100644
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -255,6 +255,7 @@ gst_divxdec_dispose (GObject * object)
   GstDivxDec *divxdec = GST_DIVXDEC (object);
 
   gst_divxdec_unset (divxdec);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 
@@ -397,8 +398,7 @@ gst_divxdec_negotiate (GstDivxDec * divxdec)
     guint32 csp;
     gint bitcnt;
   }
-  fmt_list[] =
-  {
+  fmt_list[] = {
     {
     GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'), 16, 16,
           GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'), 0}
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index 3f381930..c944c18a 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -310,6 +310,7 @@ gst_divxenc_dispose (GObject * object)
   GstDivxEnc *divxenc = GST_DIVXENC (object);
 
   gst_divxenc_unset (divxenc);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 
diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c
index a5a55278..5024bb12 100644
--- a/ext/libfame/gstlibfame.c
+++ b/ext/libfame/gstlibfame.c
@@ -132,7 +132,7 @@ framerate_to_index (gfloat fps)
 static void gst_fameenc_class_init (GstFameEncClass * klass);
 static void gst_fameenc_base_init (GstFameEncClass * klass);
 static void gst_fameenc_init (GstFameEnc * fameenc);
-static void gst_fameenc_dispose (GObject * object);
+static void gst_fameenc_finalize (GObject * object);
 
 static void gst_fameenc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -205,7 +205,7 @@ gst_fameenc_class_init (GstFameEncClass * klass)
 
   gobject_class->set_property = gst_fameenc_set_property;
   gobject_class->get_property = gst_fameenc_get_property;
-  gobject_class->dispose = gst_fameenc_dispose;
+  gobject_class->finalize = gst_fameenc_finalize;
 
   fame_object_name = g_quark_from_string ("GstFameObjectName");
 
@@ -402,13 +402,13 @@ gst_fameenc_init (GstFameEnc * fameenc)
 }
 
 static void
-gst_fameenc_dispose (GObject * object)
+gst_fameenc_finalize (GObject * object)
 {
   GstFameEnc *fameenc = GST_FAMEENC (object);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-
   g_free (fameenc->buffer);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c
index f9b67a20..264c891c 100644
--- a/ext/nas/nassink.c
+++ b/ext/nas/nassink.c
@@ -67,7 +67,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
 static void gst_nassink_base_init (gpointer g_class);
 static void gst_nassink_class_init (GstNassinkClass * klass);
 static void gst_nassink_init (GstNassink * nassink);
-static void gst_nassink_dispose (GObject * object);
+static void gst_nassink_finalize (GObject * object);
 
 static gboolean gst_nassink_open_audio (GstNassink * sink);
 static void gst_nassink_close_audio (GstNassink * sink);
@@ -153,7 +153,7 @@ gst_nassink_class_init (GstNassinkClass * klass)
 
   gobject_class->set_property = gst_nassink_set_property;
   gobject_class->get_property = gst_nassink_get_property;
-  gobject_class->dispose = gst_nassink_dispose;
+  gobject_class->finalize = gst_nassink_finalize;
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUTE, g_param_spec_boolean ("mute", "mute", "mute", TRUE, G_PARAM_READWRITE));   /* CHECKME */
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_READWRITE));    /* CHECKME */
@@ -190,11 +190,12 @@ gst_nassink_init (GstNassink * nassink)
 }
 
 static void
-gst_nassink_dispose (GObject * object)
+gst_nassink_finalize (GObject * object)
 {
   GstNassink *nassink = GST_NASSINK (object);
 
   g_free (nassink->host);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static GstCaps *
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index c08bf2d1..0d8c719c 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -150,12 +150,12 @@ gst_sdlvideosink_base_init (gpointer g_class)
 }
 
 static void
-gst_sdlvideosink_dispose (GObject * obj)
+gst_sdlvideosink_finalize (GObject * obj)
 {
   g_mutex_free (GST_SDLVIDEOSINK (obj)->lock);
 
-  if (((GObjectClass *) parent_class)->dispose)
-    ((GObjectClass *) parent_class)->dispose (obj);
+  if (((GObjectClass *) parent_class)->finalize)
+    ((GObjectClass *) parent_class)->finalize (obj);
 }
 
 static void
@@ -173,7 +173,7 @@ gst_sdlvideosink_class_init (GstSDLVideoSinkClass * klass)
 
   gobject_class->set_property = gst_sdlvideosink_set_property;
   gobject_class->get_property = gst_sdlvideosink_get_property;
-  gobject_class->dispose = gst_sdlvideosink_dispose;
+  gobject_class->finalize = gst_sdlvideosink_finalize;
 
   gstelement_class->change_state = gst_sdlvideosink_change_state;
 
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index d48e2d4f..7a83e067 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -327,7 +327,10 @@ gst_sf_dispose (GObject * object)
 {
   GstSF *this = (GstSF *) object;
 
-  gst_object_unparent (GST_OBJECT (this->provided_clock));
+  if (this->provided_clock) {
+    gst_object_unparent (GST_OBJECT (this->provided_clock));
+    this->provided_clock = NULL;
+  }
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }