[telepathy-stream-engine/master] Connect to src-pad-added with connect_object to make sure its not called after the object has been disposed of

Olivier Crête olivier.crete at collabora.co.uk
Mon Aug 10 14:00:49 PDT 2009


---
 src/audiostream.c |    5 +++--
 src/videostream.c |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/audiostream.c b/src/audiostream.c
index 82b69c4..c4dd007 100644
--- a/src/audiostream.c
+++ b/src/audiostream.c
@@ -205,8 +205,9 @@ tp_stream_engine_audio_stream_constructor (GType type,
       self->priv->stream, "free-resource", G_CALLBACK (free_resource),
       self);
 
-  self->priv->src_pad_added_handler_id = g_signal_connect (self->priv->stream,
-      "src-pad-added", G_CALLBACK (src_pad_added_cb), self);
+  self->priv->src_pad_added_handler_id = g_signal_connect_object (
+      self->priv->stream, "src-pad-added", G_CALLBACK (src_pad_added_cb), self,
+      0);
 
  out:
   return obj;
diff --git a/src/videostream.c b/src/videostream.c
index 12f7707..27e32b9 100644
--- a/src/videostream.c
+++ b/src/videostream.c
@@ -280,8 +280,9 @@ tp_stream_engine_video_stream_constructor (GType type,
   gst_object_unref (sinkpad);
 
 
-  self->priv->src_pad_added_handler_id = g_signal_connect (self->priv->stream,
-      "src-pad-added", G_CALLBACK (src_pad_added_cb), self);
+  self->priv->src_pad_added_handler_id = g_signal_connect_object (
+      self->priv->stream, "src-pad-added", G_CALLBACK (src_pad_added_cb), self,
+      0);
 
   return obj;
 }
-- 
1.5.6.5



More information about the telepathy-commits mailing list