[Telepathy-commits] [telepathy-salut/master] Stream tubes: Simplify extra_bytestream_negotiate_cb: remove uneeded parameters

[Alban Crequy]

20080728140901-a41c0-c6b2fc5d92753a09842391562e17c448ea958c74.gz
---
 src/salut-si-bytestream-manager.c |    6 ++----
 src/salut-si-bytestream-manager.h |    3 +--
 src/tube-stream.c                 |    2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/salut-si-bytestream-manager.c b/src/salut-si-bytestream-manager.c
index 60bfdfe..0cf47fe 100644
--- a/src/salut-si-bytestream-manager.c
+++ b/src/salut-si-bytestream-manager.c
@@ -909,8 +909,7 @@ si_request_reply_cb (SalutXmppConnectionManager *manager,
 
 END:
   /* user callback */
-  data->func (bytestream, data->stream_id, stanza,
-      data->user_data);
+  data->func (bytestream, data->user_data);
 
   streaminit_reply_cb_data_free (data);
 }
@@ -998,8 +997,7 @@ xmpp_connection_manager_connection_failed_cb (SalutXmppConnectionManager *mgr,
 
  /* Call the user callback without bytestream to inform him the SI request
   * failed */
-  data->func (NULL, data->stream_id, NULL,
-      data->user_data);
+  data->func (NULL, data->user_data);
 
   g_signal_handlers_disconnect_matched (mgr, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
       NULL, data);
diff --git a/src/salut-si-bytestream-manager.h b/src/salut-si-bytestream-manager.h
index d6fd620..8a42e7f 100644
--- a/src/salut-si-bytestream-manager.h
+++ b/src/salut-si-bytestream-manager.h
@@ -63,8 +63,7 @@ GType salut_si_bytestream_manager_get_type (void);
                               SalutSiBytestreamManagerClass))
 
 typedef void (* SalutSiBytestreamManagerNegotiateReplyFunc) (
-    GibberBytestreamIface *bytestream, const gchar *stream_id,
-    GibberXmppStanza *stanza, gpointer user_data);
+    GibberBytestreamIface *bytestream, gpointer user_data);
 
 SalutSiBytestreamManager *
 salut_si_bytestream_manager_new (SalutConnection *connection,
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 16a9468..171dde8 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -308,8 +308,6 @@ struct _extra_bytestream_negotiate_cb_data
 
 static void
 extra_bytestream_negotiate_cb (GibberBytestreamIface *bytestream,
-                               const gchar *stream_id,
-                               GibberXmppStanza *msg,
                                gpointer user_data)
 {
   struct _extra_bytestream_negotiate_cb_data *data =
-- 
1.5.6.5