telepathy-gabble: bytestream_factory_negotiate_stream(): don' t pass stream id to callbacks

[Will Thompson]

Module: telepathy-gabble
Branch: master
Commit: dfe1f729d0026ee72202f43733d9d3376b9d8447
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=dfe1f729d0026ee72202f43733d9d3376b9d8447

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Mar 29 13:45:47 2012 +0100

bytestream_factory_negotiate_stream(): don't pass stream id to callbacks

None of them use it, so…

---

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

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 3925a15..b3d50fc 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -2123,7 +2123,7 @@ END:
   /* user callback */
   if (object != NULL)
     {
-      data->func (bytestream, (const gchar*) data->stream_id, reply_msg,
+      data->func (bytestream, reply_msg,
           object, tp_weak_ref_get_user_data (data->weak_object));
       g_clear_object (&object);
     }
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 45cee00..76287e0 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -71,7 +71,7 @@ typedef struct {
 } GabbleSocks5Proxy;
 
 typedef void (* GabbleBytestreamFactoryNegotiateReplyFunc) (
-    GabbleBytestreamIface *bytestream, const gchar *stream_id, WockyStanza *msg,
+    GabbleBytestreamIface *bytestream, WockyStanza *msg,
     GObject *object, gpointer user_data);
 
 GabbleBytestreamFactory *gabble_bytestream_factory_new (
diff --git a/src/ft-channel.c b/src/ft-channel.c
index df57295..791c23d 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -1079,7 +1079,6 @@ set_gtalk_file_collection (
 
 static void
 bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
-                         const gchar *stream_id,
                          WockyStanza *msg,
                          GObject *object,
                          gpointer user_data)
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index f852c3a..d982e79 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1000,7 +1000,6 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
 
 static void
 bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
-                         const gchar *stream_id,
                          WockyStanza *msg,
                          GObject *object,
                          gpointer user_data)
diff --git a/src/tube-stream.c b/src/tube-stream.c
index e5cc0f9..e1d2289 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -406,7 +406,6 @@ extra_bytestream_state_changed_cb (GabbleBytestreamIface *bytestream,
 
 static void
 extra_bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
-                               const gchar *stream_id,
                                WockyStanza *msg,
                                GObject *object,
                                gpointer user_data)