diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-06-10 09:50:02 -0700 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-06-10 09:50:02 -0700 |
| commit | 715d9c61c2ed93995e92add0b80e5a2a2fae8e0e (patch) | |
| tree | 0b0a707697c42e0aa9c778892e39ca3090b719aa | |
| parent | aa32b795887c58a785cc0b2de8ad93154db7e3d7 (diff) | |
| download | telepathy-farstream-715d9c61c2ed93995e92add0b80e5a2a2fae8e0e.tar.gz | |
Clarify the FsConference reference counting slightly
| -rw-r--r-- | telepathy-farstream/call-channel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/telepathy-farstream/call-channel.c b/telepathy-farstream/call-channel.c index ad67c08..2f60f90 100644 --- a/telepathy-farstream/call-channel.c +++ b/telepathy-farstream/call-channel.c @@ -567,6 +567,8 @@ tf_call_channel_error (TfCallChannel *channel) } +/* This always returns a reference, one should use _put_conference to unref it + */ FsConference * _tf_call_channel_get_conference (TfCallChannel *channel, const gchar *conference_type) @@ -597,7 +599,8 @@ _tf_call_channel_get_conference (TfCallChannel *channel, return NULL; } - gst_object_ref (cc->fsconference); + /* Take ownership of the conference */ + gst_object_ref_sink (cc->fsconference); g_hash_table_insert (channel->fsconferences, cc->conference_type, cc); g_signal_emit (channel, signals[SIGNAL_FS_CONFERENCE_ADDED], 0, |