[Telepathy-commits] [telepathy-gabble/master] pass object arg to GabbleBytestreamFactoryNegotiateReplyFunc

[Guillaume Desmottes]

---
 src/bytestream-factory.c |    2 +-
 src/bytestream-factory.h |    2 +-
 src/tube-dbus.c          |    1 +
 src/tube-stream.c        |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 7e87961..8a3254b 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -1560,7 +1560,7 @@ END:
 
   /* user callback */
   data->func (bytestream, (const gchar*) data->stream_id, reply_msg,
-      data->user_data);
+      data->object, data->user_data);
 
   if (peer_resource != NULL)
     g_free (peer_resource);
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index be0012f..2c5faf2 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -68,7 +68,7 @@ GType gabble_bytestream_factory_get_type (void);
 
 typedef void (* GabbleBytestreamFactoryNegotiateReplyFunc) (
     GabbleBytestreamIface *bytestream, const gchar *stream_id, LmMessage *msg,
-    gpointer user_data);
+    GObject *object, gpointer user_data);
 
 GabbleBytestreamFactory *gabble_bytestream_factory_new (
     GabbleConnection *conn);
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index df3f285..e28bb73 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1146,6 +1146,7 @@ static void
 bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
                          const gchar *stream_id,
                          LmMessage *msg,
+                         GObject *object,
                          gpointer user_data)
 {
   GabbleTubeIface *tube = user_data;
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 2e0a8f0..b88364e 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -405,6 +405,7 @@ static void
 extra_bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
                                const gchar *stream_id,
                                LmMessage *msg,
+                               GObject *object,
                                gpointer user_data)
 {
   struct _extra_bytestream_negotiate_cb_data *data =
-- 
1.5.6.5