From 1c4e9ef872af537436a0b8676256fb6c1f7e4198 Mon Sep 17 00:00:00 2001 From: David Laban Date: Tue, 20 Apr 2010 15:51:30 +0100 Subject: disconnect empathy_call_window_bus_message() in dispose (#616301) Otherwise, we will crash because priv->handler is not there. --- src/empathy-call-window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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); -- cgit v1.2.3