[Telepathy-commits] [telepathy-gabble/master] gabble_tube_stream_offer: remove useless args

[Guillaume Desmottes]

---
 src/tube-stream.c   |    8 +-------
 src/tube-stream.h   |    4 +---
 src/tubes-channel.c |    3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index d03b70b..0cf6e58 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1856,11 +1856,6 @@ send_tube_offer (GabbleTubeStream *self,
 /* can be called both from the old tube API and the new tube API */
 gboolean
 gabble_tube_stream_offer (GabbleTubeStream *self,
-                          /* FIXME: remove useless args */
-                          guint address_type,
-                          const GValue *address,
-                          guint access_control,
-                          const GValue *access_control_param,
                           GError **error)
 {
   GabbleTubeStreamPrivate *priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
@@ -1994,8 +1989,7 @@ gabble_tube_stream_offer_stream_tube (GabbleSvcChannelTypeStreamTube *iface,
   g_assert (priv->access_control_param == NULL);
   priv->access_control_param = tp_g_value_slice_dup (access_control_param);
 
-  if (!gabble_tube_stream_offer (self, address_type,
-      address, access_control, access_control_param, &error))
+  if (!gabble_tube_stream_offer (self, &error))
     {
       gabble_tube_stream_close (GABBLE_TUBE_IFACE (self), TRUE);
 
diff --git a/src/tube-stream.h b/src/tube-stream.h
index d38c7e4..8790864 100644
--- a/src/tube-stream.h
+++ b/src/tube-stream.h
@@ -81,9 +81,7 @@ gboolean gabble_tube_stream_check_params (TpSocketAddressType address_type,
     const GValue *address, TpSocketAccessControl access_control,
     const GValue *access_control_param, GError **error);
 
-gboolean gabble_tube_stream_offer (GabbleTubeStream *self, guint address_type,
-    const GValue *address, guint access_control,
-    const GValue *access_control_param, GError **error);
+gboolean gabble_tube_stream_offer (GabbleTubeStream *self, GError **error);
 
 GHashTable *gabble_tube_stream_get_supported_socket_types (void);
 
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 80e6c0b..c0cda7f 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1772,8 +1772,7 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
       NULL);
 
   /* Tube was created using the old API so is already offered */
-  if (!gabble_tube_stream_offer (GABBLE_TUBE_STREAM (tube), address_type,
-      address, access_control, access_control_param, &error))
+  if (!gabble_tube_stream_offer (GABBLE_TUBE_STREAM (tube), &error))
     {
       gabble_tube_iface_close (tube, TRUE);
 
-- 
1.5.6.5