summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPekka Pessi <Pekka.Pessi@nokia.com>2011-01-26 17:17:00 +0200
committerPekka Pessi <Pekka.Pessi@nokia.com>2011-01-26 17:17:00 +0200
commit4b36122df7b8ddb1973b1e0c6bd01c1b54971695 (patch)
tree152f0e4d6433b958fa4c7c50471d5d17dd5a25d4 /src
parente8785a91dcfc651ca4dca5f2eaec0b989e2fb27a (diff)
ring-media-manager: TpBaseChannel is not dispose-safe
Do not run dispose when removing if channel is being destroyed.
Diffstat (limited to 'src')
-rw-r--r--src/ring-media-manager.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ring-media-manager.c b/src/ring-media-manager.c
index ac8f652..69687db 100644
--- a/src/ring-media-manager.c
+++ b/src/ring-media-manager.c
@@ -1052,7 +1052,10 @@ static void
media_channel_removed (gpointer _channel)
{
/* Ensure "closed" has been emitted */
- g_object_run_dispose (_channel);
+ if (!tp_base_channel_is_destroyed (_channel))
+ {
+ g_object_run_dispose (_channel);
+ }
g_object_unref (_channel);
}