Merge branch 'master' into tp-tube

[empathy.git] / libempathy / empathy-tp-tube.h

diff --git a/libempathy/empathy-tp-tube.h b/libempathy/empathy-tp-tube.h
index 90955caa454bcc106385908fa11d1c9b83e69db8..dd9ec4dcfc09533521500b70e4b1f3219e4b6d01 100644 (file)
--- 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,
@@ -81,6 +81,14 @@ void empathy_tp_tube_accept_stream_tube (EmpathyTpTube *tube,
   TpSocketAddressType type, EmpatyTpTubeAcceptStreamTubeCb *callback,
   gpointer user_data);
 
+typedef void (EmpathyTpTubeReadyCb)
+  (EmpathyTpTube *tube, const GError *error, gpointer user_data,
+   GObject *weak_object);
+
+void empathy_tp_tube_call_when_ready (EmpathyTpTube *tube,
+  EmpathyTpTubeReadyCb *callback, gpointer user_data, GDestroyNotify destroy,
+  GObject *weak_object);
+
 G_END_DECLS
 
 #endif /* __EMPATHY_TP_TUBE_H__ */