telepathy-rakia: The Media GPtrArray can contain NULLs, so allow them

Olivier Crête tester at kemper.freedesktop.org
Tue May 8 10:02:59 PDT 2012


Module: telepathy-rakia
Branch: master
Commit: 997315eefccb118235c1658983e14070d8865acf
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=997315eefccb118235c1658983e14070d8865acf

Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Feb 13 17:45:38 2012 -0500

The Media GPtrArray can contain NULLs, so allow them

---

 rakia/sip-session.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/rakia/sip-session.c b/rakia/sip-session.c
index e12fa63..7e9ebe8 100644
--- a/rakia/sip-session.c
+++ b/rakia/sip-session.c
@@ -185,6 +185,13 @@ event_target_init(gpointer g_iface, gpointer iface_data)
 }
 
 static void
+null_safe_unref (gpointer data)
+{
+  if (data)
+    g_object_unref (data);
+}
+
+static void
 rakia_sip_session_init (RakiaSipSession *self)
 {
   RakiaSipSessionPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
@@ -196,7 +203,7 @@ rakia_sip_session_init (RakiaSipSession *self)
   priv->rtcp_enabled = TRUE;
 
   /* allocate any data required by the object here */
-  priv->medias = g_ptr_array_new_with_free_func (g_object_unref);
+  priv->medias = g_ptr_array_new_with_free_func (null_safe_unref);
 }
 
 static void rakia_sip_session_get_property (GObject    *object,



More information about the telepathy-commits mailing list