summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Pessi <Pekka.Pessi@nokia.com>2011-01-26 17:17:17 +0200
committerPekka Pessi <Pekka.Pessi@nokia.com>2011-01-26 17:17:17 +0200
commit6f30ae520963264c3ef21c285963addea8e209ca (patch)
tree34e795fe88df0aeaf9e33b498c962e202b72455c
parent4b36122df7b8ddb1973b1e0c6bd01c1b54971695 (diff)
ring-text-manager: TpBaseChannel is not dispose-safe
Do not run dispose when removing if channel is being destroyed.
-rw-r--r--src/ring-text-manager.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ring-text-manager.c b/src/ring-text-manager.c
index 798ab8a..f0dd8b8 100644
--- a/src/ring-text-manager.c
+++ b/src/ring-text-manager.c
@@ -655,7 +655,10 @@ static void
text_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);
}