aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:13:55 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:13:55 +0800
commit93414bb13bef315e41de4a059c5463e0b0cd6c23 (patch)
tree8a0c1bddaa2d9fcc0d76986ae30c1efd76a19ca4
parentbcf8e152ef78985c91c67a9c5f3381d7d0d52be5 (diff)
downloadgsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar.gz
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar.bz2
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar.lz
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar.xz
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.tar.zst
gsoc2013-empathy-93414bb13bef315e41de4a059c5463e0b0cd6c23.zip
Add a function to explicitly close EmpathyTpCall
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2160
-rw-r--r--libempathy/empathy-tp-call.c19
-rw-r--r--libempathy/empathy-tp-call.h1
2 files changed, 16 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 7703aeffb..45aa22be1 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -503,10 +503,7 @@ tp_call_finalize (GObject *object)
if (priv->channel != NULL)
{
- g_signal_handlers_disconnect_by_func (priv->channel,
- tp_call_channel_invalidated_cb, object);
- tp_call_close_channel (EMPATHY_TP_CALL (object));
- g_object_unref (priv->channel);
+ empathy_tp_call_close (EMPATHY_TP_CALL (object));
}
if (priv->stream_engine != NULL)
@@ -666,6 +663,20 @@ empathy_tp_call_accept_incoming_call (EmpathyTpCall *call)
}
void
+empathy_tp_call_close (EmpathyTpCall *call)
+{
+ EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+ g_signal_handlers_disconnect_by_func (priv->channel,
+ tp_call_channel_invalidated_cb, call);
+
+ tp_call_close_channel (call);
+
+ g_object_unref (priv->channel);
+ priv->channel = NULL;
+}
+
+void
empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
gboolean is_sending)
{
diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h
index 5da79fa13..29a79c64e 100644
--- a/libempathy/empathy-tp-call.h
+++ b/libempathy/empathy-tp-call.h
@@ -71,6 +71,7 @@ typedef struct
GType empathy_tp_call_get_type (void) G_GNUC_CONST;
EmpathyTpCall *empathy_tp_call_new (TpChannel *channel);
+void empathy_tp_call_close (EmpathyTpCall *call);
void empathy_tp_call_accept_incoming_call (EmpathyTpCall *call);
void empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,