empathy r2639 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Sun Mar  8 20:18:34 2009
New Revision: 2639
URL: http://svn.gnome.org/viewvc/empathy?rev=2639&view=rev

Log:
Unref the video input and tee after removing

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

Modified:
   trunk/src/empathy-call-window.c

Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c	(original)
+++ trunk/src/empathy-call-window.c	Sun Mar  8 20:18:34 2009
@@ -889,8 +889,11 @@
         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 @@
 
   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;
 }