From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Sun, 8 Mar 2009 20:18:34 +0000 (+0000)
Subject: Unref the video input and tee after removing
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f91384647c6e8dbc5b8aebb58fdb96ab745376cf

Unref the video input and tee after removing

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

svn path=/trunk/; revision=2639
---

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index b94b2038..102395e5 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -889,8 +889,11 @@ empathy_call_window_sink_added_cb (EmpathyCallHandler *handler,
         gst_pad_link (pad, sink);
         break;
       case TP_MEDIA_STREAM_TYPE_VIDEO:
-        pad =  gst_element_get_request_pad (priv->video_tee, "src%d");
-        gst_pad_link (pad, sink);
+        if (priv->video_input != NULL)
+          {
+            pad =  gst_element_get_request_pad (priv->video_tee, "src%d");
+            gst_pad_link (pad, sink);
+          }
         break;
       default:
         g_assert_not_reached ();
@@ -952,6 +955,11 @@ empathy_call_window_remove_video_input (EmpathyCallWindow *self)
 
   gst_bin_remove_many (GST_BIN (priv->pipeline), priv->video_input,
     priv->video_tee, preview, NULL);
+
+  g_object_unref (priv->video_input);
+  priv->video_input = NULL;
+  g_object_unref (priv->video_tee);
+  priv->video_tee = NULL;
 }