[Telepathy-commits] [telepathy-salut/master] remove parameters argument from salut_tubes_channel_tube_request

[Guillaume Desmottes]

---
 src/salut-tubes-channel.c |   17 +++++++----------
 src/salut-tubes-channel.h |    2 +-
 src/salut-tubes-manager.c |    7 +------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 09f44ed..3621338 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -983,13 +983,13 @@ generate_tube_id (void)
 SalutTubeIface *
 salut_tubes_channel_tube_request (SalutTubesChannel *self,
                                   const gchar *channel_type,
-                                  const gchar *service,
-                                  GHashTable *parameters)
+                                  const gchar *service)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
   SalutTubeIface *tube;
   guint tube_id;
   TpTubeType type;
+  GHashTable *parameters;
 
   tube_id = generate_tube_id ();
 
@@ -1007,14 +1007,6 @@ salut_tubes_channel_tube_request (SalutTubesChannel *self,
   else
     g_assert_not_reached ();
 
-  if (parameters == NULL)
-    {
-      /* If it is not included in the request, the connection manager MUST
-       * consider the property to be empty. */
-      parameters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-          (GDestroyNotify) tp_g_value_slice_free);
-    }
-
   /* if the service property is missing, the requestotron rejects the request
    */
   g_assert (service != NULL);
@@ -1022,9 +1014,14 @@ salut_tubes_channel_tube_request (SalutTubesChannel *self,
   DEBUG ("Request a tube channel with type='%s' and service='%s'",
       channel_type, service);
 
+  /* requested tubes have an empty parameters dict */
+  parameters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+          (GDestroyNotify) tp_g_value_slice_free);
+
   tube = create_new_tube (self, type, priv->self_handle, FALSE, service,
       parameters, tube_id, 0, NULL);
 
+  g_hash_table_destroy (parameters);
   return tube;
 }
 
diff --git a/src/salut-tubes-channel.h b/src/salut-tubes-channel.h
index e463caf..7b97007 100644
--- a/src/salut-tubes-channel.h
+++ b/src/salut-tubes-channel.h
@@ -86,7 +86,7 @@ void salut_tubes_channel_message_close_received (SalutTubesChannel *self,
     TpHandle initiator_handle, guint tube_id);
 
 SalutTubeIface *salut_tubes_channel_tube_request (SalutTubesChannel *self,
-    const gchar *channel_type, const gchar *service, GHashTable *parameters);
+    const gchar *channel_type, const gchar *service);
 
 void salut_tubes_channel_send_iq_offer (SalutTubesChannel *self);
 
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index fcc3915..2bff326 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -939,7 +939,6 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
     {
       SalutTubeIface *new_channel;
       GSList *tokens = NULL;
-      GHashTable *parameters;
 
       if (tubes_channel == NULL)
         {
@@ -949,12 +948,8 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
             goto error;
         }
 
-      parameters = tp_asv_get_boxed (request_properties,
-          SALUT_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
-          TP_HASH_TYPE_STRING_VARIANT_MAP);
-
       new_channel = salut_tubes_channel_tube_request (tubes_channel,
-          channel_type, service, parameters);
+          channel_type, service);
       g_assert (new_channel != NULL);
 
       if (request_token != NULL)
-- 
1.5.6.5