aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Laban <david.laban@collabora.co.uk>2010-04-20 22:51:30 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-21 15:28:23 +0800
commit1c4e9ef872af537436a0b8676256fb6c1f7e4198 (patch)
tree918acbd53410b966a48a878ab6af854fc82ff6c3
parentf2684964e27ae50e40b9708aeb5f46562b25df29 (diff)
downloadgsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar.gz
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar.bz2
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar.lz
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar.xz
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.tar.zst
gsoc2013-empathy-1c4e9ef872af537436a0b8676256fb6c1f7e4198.zip
disconnect empathy_call_window_bus_message() in dispose (#616301)
Otherwise, we will crash because priv->handler is not there.
-rw-r--r--src/empathy-call-window.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 8dc0d550f..943e2cd0f 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1436,6 +1436,12 @@ empathy_call_window_dispose (GObject *object)
}
priv->handler = NULL;
+ if (priv->bus_message_source_id != 0)
+ {
+ g_source_remove (priv->bus_message_source_id);
+ priv->bus_message_source_id = 0;
+ }
+
if (priv->pipeline != NULL)
g_object_unref (priv->pipeline);
priv->pipeline = NULL;
@@ -1502,12 +1508,6 @@ empathy_call_window_finalize (GObject *object)
priv->video_output_motion_handler_id = 0;
}
- if (priv->bus_message_source_id != 0)
- {
- g_source_remove (priv->bus_message_source_id);
- priv->bus_message_source_id = 0;
- }
-
/* free any data held directly by the object here */
g_mutex_free (priv->lock);