diff options
| author | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2011-05-15 17:52:22 -0500 |
|---|---|---|
| committer | Mike Ruprecht <mike.ruprecht@collabora.co.uk> | 2011-05-15 17:52:22 -0500 |
| commit | 56b3e908c5829f885a518c00924157d8997a8ebe (patch) | |
| tree | 517b91199e995a9fadc5d9395294dc4d53ebe1df | |
| parent | 179a352f0f8a248d54afe0fca93d1a78ccd8d6a5 (diff) | |
tpy_call_content_codec_offer_offer shouldn't own the cancellable
| -rw-r--r-- | telepathy-yell/base-media-call-content.c | 1 | ||||
| -rw-r--r-- | telepathy-yell/call-content-codec-offer.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/telepathy-yell/base-media-call-content.c b/telepathy-yell/base-media-call-content.c index 1e0bab5..f307b94 100644 --- a/telepathy-yell/base-media-call-content.c +++ b/telepathy-yell/base-media-call-content.c @@ -473,6 +473,7 @@ out: if (priv->current_offer == TPY_CALL_CONTENT_CODEC_OFFER (source)) { priv->current_offer = NULL; + g_object_unref (priv->offer_cancellable); priv->offer_cancellable = NULL; } diff --git a/telepathy-yell/call-content-codec-offer.c b/telepathy-yell/call-content-codec-offer.c index 6396734..040791a 100644 --- a/telepathy-yell/call-content-codec-offer.c +++ b/telepathy-yell/call-content-codec-offer.c @@ -393,7 +393,7 @@ tpy_call_content_codec_offer_offer (TpyCallContentCodecOffer *offer, if (cancellable != NULL) { - priv->cancellable = cancellable; + priv->cancellable = g_object_ref (cancellable); priv->handler_id = g_cancellable_connect ( cancellable, G_CALLBACK (cancelled_cb), offer, NULL); } |