aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-23 02:00:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-30 19:28:23 +0800
commit09c8c6dee9aaf2ff5e19bc78c3c59d5013098990 (patch)
tree588ab4ebd1615c6ca661989849efc8a76b2fff77
parent3b1c4d6e3e072373bc7b55db8dbe8c50796bf7fd (diff)
downloadgsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar.gz
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar.bz2
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar.lz
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar.xz
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.tar.zst
gsoc2013-empathy-09c8c6dee9aaf2ff5e19bc78c3c59d5013098990.zip
call-window: call empathy_call_handler_stop_call when closing a call
This will allow us to properly terminate the call.
-rw-r--r--src/empathy-call-window.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 21a2e68a5..99e1cc8ff 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1331,7 +1331,10 @@ empathy_call_window_dispose (GObject *object)
}
if (priv->handler != NULL)
- g_object_unref (priv->handler);
+ {
+ empathy_call_handler_stop_call (priv->handler);
+ g_object_unref (priv->handler);
+ }
priv->handler = NULL;
if (priv->pipeline != NULL)
@@ -2667,6 +2670,10 @@ static void
empathy_call_window_hangup_cb (gpointer object,
EmpathyCallWindow *window)
{
+ EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+ empathy_call_handler_stop_call (priv->handler);
+
if (empathy_call_window_disconnected (window))
gtk_widget_destroy (GTK_WIDGET (window));
}