From 1e59b651ba043118613eacb435dbd48eaa9c551b Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 29 Aug 2011 12:38:54 +0200
Subject: [PATCH] mini-object: use ref/unref directly in boxed copy/free

GLib will not call our copy/free with a NULL object
---
 gst/gstminiobject.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c
index 9e83e8d481..09d796cb2c 100644
--- a/gst/gstminiobject.c
+++ b/gst/gstminiobject.c
@@ -48,24 +48,6 @@ static GstAllocTrace *_gst_mini_object_trace;
 /* Mutex used for weak referencing */
 G_LOCK_DEFINE_STATIC (weak_refs_mutex);
 
-/* boxed copy and free functions. Don't real copy or free but simply
- * change the refcount */
-static GstMiniObject *
-_gst_mini_object_boxed_copy (GstMiniObject * mini_object)
-{
-  if (mini_object)
-    return gst_mini_object_ref (mini_object);
-  else
-    return NULL;
-}
-
-static void
-_gst_mini_object_boxed_free (GstMiniObject * mini_object)
-{
-  if (mini_object)
-    gst_mini_object_unref (mini_object);
-}
-
 /**
  * gst_mini_object_register:
  * @name: name of the new boxed type
@@ -84,8 +66,8 @@ gst_mini_object_register (const gchar * name)
   g_return_val_if_fail (name != NULL, 0);
 
   type = g_boxed_type_register_static (name,
-      (GBoxedCopyFunc) _gst_mini_object_boxed_copy,
-      (GBoxedFreeFunc) _gst_mini_object_boxed_free);
+      (GBoxedCopyFunc) gst_mini_object_ref,
+      (GBoxedFreeFunc) gst_mini_object_unref);
 
   return type;
 }