diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-22 23:47:31 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-05-22 23:47:31 +0800 |
| commit | d6328ff8dc911f787ace5c6fff922c628944a6b3 (patch) | |
| tree | 5a4a862c51ea09461724d8a5c98d2671534031f0 /libempathy | |
| parent | 26699d3c9580c2aeb41f1bcb9fc3cb2ca512fae9 (diff) | |
| parent | 401b81d9cf9667283cabea8d1d9b5926d9d77a9c (diff) | |
| download | gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar.gz gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar.bz2 gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar.lz gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar.xz gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.tar.zst gsoc2013-empathy-d6328ff8dc911f787ace5c6fff922c628944a6b3.zip | |
Merge commit 'ksz/fix-bug-583558'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-tube.c | 6 |
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)); |