summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-09-09 15:19:51 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-09-09 15:19:51 -0400
commitcc121ebc307ae3105be3ab019cc51eaa159db4c6 (patch)
treee9002fd0b4cb128ac863396b65cdcd6ecc8a15b3
parent251137a2d30ccc0276ad43c3fe2988ecb85bdfd0 (diff)
Unref participant and conference when disposing of TfStream
-rw-r--r--telepathy-farsight/session.c1
-rw-r--r--telepathy-farsight/stream.c12
2 files changed, 12 insertions, 1 deletions
diff --git a/telepathy-farsight/session.c b/telepathy-farsight/session.c
index 832495c..c64a23c 100644
--- a/telepathy-farsight/session.c
+++ b/telepathy-farsight/session.c
@@ -199,7 +199,6 @@ _tf_session_dispose (GObject *object)
if (self->priv->fs_participant)
{
-
g_object_unref (self->priv->fs_participant);
self->priv->fs_participant = NULL;
}
diff --git a/telepathy-farsight/stream.c b/telepathy-farsight/stream.c
index df85441..9e589ce 100644
--- a/telepathy-farsight/stream.c
+++ b/telepathy-farsight/stream.c
@@ -383,6 +383,18 @@ tf_stream_dispose (GObject *object)
priv->fs_session = NULL;
}
+ if (priv->fs_participant)
+ {
+ g_object_unref (priv->fs_participant);
+ priv->fs_participant = NULL;
+ }
+
+ if (priv->fs_conference)
+ {
+ g_object_unref (priv->fs_conference);
+ priv->fs_conference = NULL;
+ }
+
if (priv->local_preferences)
{
fs_codec_list_destroy (priv->local_preferences);