diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-21 15:39:09 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-01-21 15:39:09 +0200 |
| commit | d8c674ea30c77378d7fe97629e96bb96a6d3f5cd (patch) | |
| tree | 6d03b1d45b3dd7664be6a1dbd5dea366e3cd0548 /src | |
| parent | 436ee2d858d8260fd5d375dc2c9b6c9e81715c02 (diff) | |
| parent | 6b6126ac36645c81292ba89c42cbf2e304b8d2e3 (diff) | |
Merge commit 'refs/merge-requests/7' of git://gitorious.org/meego-cellular/telepathy-ring into merger
Diffstat (limited to 'src')
| -rw-r--r-- | src/ring-call-channel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ring-call-channel.c b/src/ring-call-channel.c index d53c85c..8ad659a 100644 --- a/src/ring-call-channel.c +++ b/src/ring-call-channel.c @@ -106,7 +106,7 @@ struct _RingCallChannelPrivate uint8_t state; - unsigned constructed:1, released:1, closing:1; + unsigned constructed:1, released:1, closing:1, disposed:1; unsigned call_instance_seen:1; @@ -442,6 +442,10 @@ ring_call_channel_dispose(GObject *object) RingCallChannelPrivate *priv = self->priv; TpBaseChannel *base = TP_BASE_CHANNEL (object); + if (self->priv->disposed) + return; + self->priv->disposed = TRUE; + if (priv->member.handle) { TpHandleRepoIface *repo = tp_base_connection_get_handles( tp_base_channel_get_connection (base), TP_HANDLE_TYPE_CONTACT); |