From 54367a2d36208e7b697eb435a7d51d88f49f35a9 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 7 Mar 2014 14:48:06 -0600
Subject: [PATCH] ges: Ensure GObject finalize and dispose methods chain up to
 parents

https://bugzilla.gnome.org/show_bug.cgi?id=725918
---
 ges/ges-clip-asset.c      | 11 -----------
 ges/ges-container.c       |  2 ++
 ges/ges-formatter.c       |  2 ++
 ges/ges-project.c         |  2 ++
 ges/gstframepositionner.c |  2 ++
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ges/ges-clip-asset.c b/ges/ges-clip-asset.c
index 1ebe26e..cf3fdcd 100644
--- a/ges/ges-clip-asset.c
+++ b/ges/ges-clip-asset.c
@@ -55,15 +55,6 @@ static GParamSpec *properties[PROP_LAST];
  *      GObject vmetods implemenation          *
  *                                             *
  ***********************************************/
-static void
-_dispose (GObject * object)
-{
-}
-
-static void
-_finalize (GObject * object)
-{
-}
 
 static void
 _get_property (GObject * object, guint property_id,
@@ -123,8 +114,6 @@ ges_clip_asset_class_init (GESClipAssetClass * self_class)
 
   g_type_class_add_private (self_class, sizeof (GESClipAssetPrivate));
   object_class->constructed = _constructed;
-  object_class->dispose = _dispose;
-  object_class->finalize = _finalize;
   object_class->get_property = _get_property;
   object_class->set_property = _set_property;
 
diff --git a/ges/ges-container.c b/ges/ges-container.c
index 8c3d9c4..68e3680 100644
--- a/ges/ges-container.c
+++ b/ges/ges-container.c
@@ -196,6 +196,8 @@ _dispose (GObject * object)
   GESContainer *self = GES_CONTAINER (object);
 
   g_hash_table_unref (self->priv->mappings);
+
+  G_OBJECT_CLASS (ges_container_parent_class)->dispose (object);
 }
 
 static void
diff --git a/ges/ges-formatter.c b/ges/ges-formatter.c
index 2ba3cf1..aab6e16 100644
--- a/ges/ges-formatter.c
+++ b/ges/ges-formatter.c
@@ -140,6 +140,8 @@ static void
 ges_formatter_dispose (GObject * object)
 {
   ges_formatter_set_project (GES_FORMATTER (object), NULL);
+
+  G_OBJECT_CLASS (ges_formatter_parent_class)->dispose (object);
 }
 
 static gboolean
diff --git a/ges/ges-project.c b/ges/ges-project.c
index 5c95ca8..dfb2497 100644
--- a/ges/ges-project.c
+++ b/ges/ges-project.c
@@ -273,6 +273,8 @@ _finalize (GObject * object)
 
   if (priv->uri)
     g_free (priv->uri);
+
+  G_OBJECT_CLASS (ges_project_parent_class)->finalize (object);
 }
 
 static void
diff --git a/ges/gstframepositionner.c b/ges/gstframepositionner.c
index ae75bcd..b9cfeb6 100644
--- a/ges/gstframepositionner.c
+++ b/ges/gstframepositionner.c
@@ -226,6 +226,8 @@ gst_frame_positionner_dispose (GObject * object)
         (GWeakNotify) _weak_notify_cb, pos);
     pos->current_track = NULL;
   }
+
+  G_OBJECT_CLASS (gst_frame_positionner_parent_class)->dispose (object);
 }
 
 static void
-- 
2.7.4