[Telepathy-commits] [telepathy-gabble/master] tubes-channel: no need to copy the tube parameters as the tube object already makes its own copy

[Guillaume Desmottes]

---
 src/tubes-channel.c |   31 ++-----------------------------
 1 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 1125e8d..6c7ac8d 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -990,23 +990,6 @@ gabble_tubes_channel_list_tubes (TpSvcChannelTypeTubes *iface,
   g_ptr_array_free (ret, TRUE);
 }
 
-static void
-copy_parameter (gpointer key,
-                gpointer value,
-                gpointer user_data)
-{
-  const gchar *prop = key;
-  GValue *gvalue = value;
-  GHashTable *parameters = user_data;
-  GValue *gvalue_copied;
-
-  gvalue_copied = g_slice_new0 (GValue);
-  g_value_init (gvalue_copied, G_VALUE_TYPE (gvalue));
-  g_value_copy (gvalue, gvalue_copied);
-
-  g_hash_table_insert (parameters, g_strdup (prop), gvalue_copied);
-}
-
 struct _i_hate_g_hash_table_foreach
 {
   GabbleTubesChannel *self;
@@ -1604,7 +1587,6 @@ gabble_tubes_channel_offer_d_bus_tube (TpSvcChannelTypeTubes *iface,
   TpBaseConnection *base;
   guint tube_id;
   GabbleTubeIface *tube;
-  GHashTable *parameters_copied;
   gchar *stream_id;
 
   g_assert (GABBLE_IS_TUBES_CHANNEL (self));
@@ -1612,15 +1594,11 @@ gabble_tubes_channel_offer_d_bus_tube (TpSvcChannelTypeTubes *iface,
   priv = GABBLE_TUBES_CHANNEL_GET_PRIVATE (self);
   base = (TpBaseConnection *) priv->conn;
 
-  parameters_copied = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-      (GDestroyNotify) tp_g_value_slice_free);
-  g_hash_table_foreach (parameters, copy_parameter, parameters_copied);
-
   stream_id = gabble_bytestream_factory_generate_stream_id ();
   tube_id = generate_tube_id ();
 
   tube = create_new_tube (self, TP_TUBE_TYPE_DBUS, priv->self_handle,
-      service, parameters_copied, (const gchar *) stream_id, tube_id, NULL);
+      service, parameters, (const gchar *) stream_id, tube_id, NULL);
 
   if (priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     {
@@ -1685,7 +1663,6 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
   TpBaseConnection *base;
   guint tube_id;
   GabbleTubeIface *tube;
-  GHashTable *parameters_copied;
   gchar *stream_id;
   GError *error = NULL;
 
@@ -1702,15 +1679,11 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
       return;
     }
 
-  parameters_copied = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-      (GDestroyNotify) tp_g_value_slice_free);
-  g_hash_table_foreach (parameters, copy_parameter, parameters_copied);
-
   stream_id = gabble_bytestream_factory_generate_stream_id ();
   tube_id = generate_tube_id ();
 
   tube = create_new_tube (self, TP_TUBE_TYPE_STREAM, priv->self_handle,
-      service, parameters_copied, (const gchar *) stream_id, tube_id, NULL);
+      service, parameters, (const gchar *) stream_id, tube_id, NULL);
 
   g_object_set (tube,
       "address-type", address_type,
-- 
1.5.6.5