diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-22 17:42:54 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-22 17:59:34 +0800 |
commit | d22972c5b30ef8b771a148e57d80a9f4d54424c8 (patch) | |
tree | c47969cf210b19c921583cb1c98ab4aa888affc0 | |
parent | 31e110e96745858e11fce4fffab2334d5e32a873 (diff) | |
download | gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar.gz gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar.bz2 gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar.lz gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar.xz gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.tar.zst gsoc2013-empathy-d22972c5b30ef8b771a148e57d80a9f4d54424c8.zip |
remove empathy_tp_call_to
We don't need it any more:
- The TpContact is now always set during object construction
- The status is changed once the contact has been set
- We don't need to request streams any more as we use Initial{Audio,Video}
-rw-r--r-- | libempathy/empathy-call-handler.c | 3 | ||||
-rw-r--r-- | libempathy/empathy-tp-call.c | 22 | ||||
-rw-r--r-- | libempathy/empathy-tp-call.h | 3 |
3 files changed, 0 insertions, 28 deletions
diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c index c3cbf4ee7..9ba115a60 100644 --- a/libempathy/empathy-call-handler.c +++ b/libempathy/empathy-call-handler.c @@ -463,9 +463,6 @@ empathy_call_handler_request_cb (EmpathyDispatchOperation *operation, empathy_call_handler_start_tpfs (self); - empathy_tp_call_to (priv->call, priv->contact, - priv->initial_audio, priv->initial_video); - empathy_dispatch_operation_claim (operation); } diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index 583e9fc9f..16689e608 100644 --- a/libempathy/empathy-tp-call.c +++ b/libempathy/empathy-tp-call.c @@ -316,28 +316,6 @@ tp_call_update_status (EmpathyTpCall *call) g_object_unref (call); } -void -empathy_tp_call_to (EmpathyTpCall *call, EmpathyContact *contact, - gboolean audio, gboolean video) -{ - EmpathyTpCallPriv *priv = GET_PRIV (call); - EmpathyCapabilities capabilities = 0; - - g_assert (audio || video); - - priv->contact = g_object_ref (contact); - priv->status = EMPATHY_TP_CALL_STATUS_PENDING; - g_object_notify (G_OBJECT (call), "contact"); - g_object_notify (G_OBJECT (call), "status"); - - if (video) - capabilities |= EMPATHY_CAPABILITIES_VIDEO; - if (audio) - capabilities |= EMPATHY_CAPABILITIES_AUDIO; - - tp_call_request_streams_for_capabilities (call, capabilities); -} - static void tp_call_channel_invalidated_cb (TpChannel *channel, GQuark domain, diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h index ff51055e7..d866a2e6e 100644 --- a/libempathy/empathy-tp-call.h +++ b/libempathy/empathy-tp-call.h @@ -76,9 +76,6 @@ 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_to (EmpathyTpCall *call, EmpathyContact *contact, - gboolean audio, gboolean video); - void empathy_tp_call_accept_incoming_call (EmpathyTpCall *call); void empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call, gboolean is_sending); |