aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-17 05:25:10 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-17 05:25:10 +0800
commit57421f481723492fc5a25391697316871fc69094 (patch)
tree13429ad7f234c58c31a4743ba7003dec05353163 /libempathy
parent22171e223624ae93d06404cd4b6729204e3b5328 (diff)
downloadgsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar.gz
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar.bz2
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar.lz
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar.xz
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.tar.zst
gsoc2013-empathy-57421f481723492fc5a25391697316871fc69094.zip
add parameters arg to empathy_tp_tube_new_stream_tube and use latest offer API
From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2486
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-tube.c6
-rw-r--r--libempathy/empathy-tp-tube.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-tube.c b/libempathy/empathy-tp-tube.c
index f8ce0536f..793b6ff7a 100644
--- a/libempathy/empathy-tp-tube.c
+++ b/libempathy/empathy-tp-tube.c
@@ -271,7 +271,8 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
TpSocketAddressType type,
const gchar *hostname,
guint port,
- const gchar *service)
+ const gchar *service,
+ GHashTable *parameters)
{
MissionControl *mc;
McAccount *account;
@@ -348,7 +349,8 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
if (!emp_cli_channel_type_stream_tube_run_offer_stream_tube (
TP_PROXY(channel), -1, type, address,
- TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, &error, NULL))
+ TP_SOCKET_ACCESS_CONTROL_LOCALHOST, control_param, parameters,
+ &error, NULL))
{
DEBUG ("Couldn't offer tube: %s", error->message);
g_clear_error (&error);
diff --git a/libempathy/empathy-tp-tube.h b/libempathy/empathy-tp-tube.h
index 90955caa4..8e63945e5 100644
--- a/libempathy/empathy-tp-tube.h
+++ b/libempathy/empathy-tp-tube.h
@@ -71,7 +71,7 @@ GType empathy_tp_tube_get_type (void) G_GNUC_CONST;
EmpathyTpTube *empathy_tp_tube_new (TpChannel *channel);
EmpathyTpTube *empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
TpSocketAddressType type, const gchar *hostname, guint port,
- const gchar *service);
+ const gchar *service, GHashTable *parameters);
typedef void (EmpatyTpTubeAcceptStreamTubeCb) (EmpathyTpTube *tube,
const EmpathyTpTubeAddress *address, const GError *error,