aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorArnaud Maillet <arnaud.maillet@collabora.co.uk>2009-05-22 22:02:00 +0800
committerArnaud Maillet <arnaud.maillet@collabora.co.uk>2009-05-22 22:02:00 +0800
commit401b81d9cf9667283cabea8d1d9b5926d9d77a9c (patch)
treef8b1b2cab5eb6365e91a492077fa061f1802438f /libempathy
parent7b1c449738cd5800d54335eb5512a3b8231b1e12 (diff)
downloadgsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar.gz
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar.bz2
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar.lz
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar.xz
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.tar.zst
gsoc2013-empathy-401b81d9cf9667283cabea8d1d9b5926d9d77a9c.zip
Rename OfferStreamTube and AcceptStreamTube to Offer and Accept
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-tube.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-tube.c b/libempathy/empathy-tp-tube.c
index 601ad0626..c2ec0ba31 100644
--- a/libempathy/empathy-tp-tube.c
+++ b/libempathy/empathy-tp-tube.c
@@ -518,9 +518,9 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
else
g_hash_table_ref (parameters);
- if (!emp_cli_channel_type_stream_tube_run_offer_stream_tube (
+ if (!emp_cli_channel_type_stream_tube_run_offer (
TP_PROXY(channel), -1, type, address,
- TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, parameters,
+ TP_SOCKET_ACCESS_CONTROL_LOCALHOST, parameters,
&error, NULL))
{
DEBUG ("Couldn't offer tube: %s", error->message);
@@ -609,7 +609,7 @@ empathy_tp_tube_accept_stream_tube (EmpathyTpTube *tube,
data = new_empathy_tp_tube_accept_data (type, callback, user_data);
- emp_cli_channel_type_stream_tube_call_accept_stream_tube (
+ emp_cli_channel_type_stream_tube_call_accept (
TP_PROXY (priv->channel), -1, type, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
control_param, tp_tube_accept_stream_cb, data,
free_empathy_tp_tube_accept_data, G_OBJECT (tube));