[next] telepathy-glib: remove tp_stream_tube_channel_get_parameters()

[Guillaume Desmottes]

Module: telepathy-glib
Branch: next
Commit: 0b8f02b01b026aac97f4d5515c0aa932e9d40f4f
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=0b8f02b01b026aac97f4d5515c0aa932e9d40f4f

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Feb 19 10:31:37 2014 +0100

remove tp_stream_tube_channel_get_parameters()

---

 .../telepathy-glib/telepathy-glib-sections.txt     |    1 -
 telepathy-glib/stream-tube-channel.c               |   17 --------------
 telepathy-glib/stream-tube-channel.h               |    2 --
 tests/dbus/stream-tube.c                           |   24 ++++----------------
 4 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 82b768b..412a6a2 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -5147,7 +5147,6 @@ TpStreamTubeChannel
 TpStreamTubeChannelClass
 tp_stream_tube_channel_accept_async
 tp_stream_tube_channel_accept_finish
-tp_stream_tube_channel_get_parameters
 tp_stream_tube_channel_dup_parameters_vardict
 tp_stream_tube_channel_get_service
 tp_stream_tube_channel_offer_async
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 99e4fea..c0e45b6 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -1494,23 +1494,6 @@ tp_stream_tube_channel_get_service (TpStreamTubeChannel *self)
 }
 
 /**
- * tp_stream_tube_channel_get_parameters: (skip)
- * @self: a #TpStreamTubeChannel
- *
- * Return the #TpStreamTubeChannel:parameters property
- *
- * Returns: (transfer none) (element-type utf8 GObject.Value):
- * the value of #TpStreamTubeChannel:parameters
- *
- * Since: 0.13.2
- */
-GHashTable *
-tp_stream_tube_channel_get_parameters (TpStreamTubeChannel *self)
-{
-  return self->priv->parameters;
-}
-
-/**
  * tp_stream_tube_channel_dup_parameters_vardict:
  * @self: a #TpStreamTubeChannel
  *
diff --git a/telepathy-glib/stream-tube-channel.h b/telepathy-glib/stream-tube-channel.h
index ea1db38..329fdb5 100644
--- a/telepathy-glib/stream-tube-channel.h
+++ b/telepathy-glib/stream-tube-channel.h
@@ -61,8 +61,6 @@ GType tp_stream_tube_channel_get_type (void);
 
 const gchar * tp_stream_tube_channel_get_service (TpStreamTubeChannel *self);
 
-GHashTable * tp_stream_tube_channel_get_parameters (TpStreamTubeChannel *self);
-
 _TP_AVAILABLE_IN_0_20
 GVariant *tp_stream_tube_channel_dup_parameters_vardict (
     TpStreamTubeChannel *self);
diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c
index 82cec64..4d9bf27 100644
--- a/tests/dbus/stream-tube.c
+++ b/tests/dbus/stream-tube.c
@@ -237,21 +237,17 @@ test_creation (Test *test,
 }
 
 static void
-check_parameters (GHashTable *parameters,
-    GVariant *parameters_vardict)
+check_parameters (GVariant *parameters_vardict)
 {
   gboolean found;
   guint32 u32;
 
-  g_assert (parameters != NULL);
   g_assert (parameters_vardict != NULL);
   g_assert_cmpstr (g_variant_get_type_string (parameters_vardict), ==,
       "a{sv}");
 
-  g_assert_cmpuint (g_hash_table_size (parameters), ==, 1);
   g_assert_cmpuint (g_variant_n_children (parameters_vardict), ==, 1);
 
-  g_assert_cmpuint (tp_asv_get_uint32 (parameters, "badger", NULL), ==, 42);
   found = g_variant_lookup (parameters_vardict, "badger", "u", &u32);
   g_assert_cmpint (found, ==, TRUE);
   g_assert_cmpuint (u32, ==, 42);
@@ -262,7 +258,6 @@ test_properties (Test *test,
     gconstpointer data G_GNUC_UNUSED)
 {
   gchar *service;
-  GHashTable *parameters;
   GVariant *parameters_vardict;
 
   /* Outgoing tube */
@@ -277,11 +272,6 @@ test_properties (Test *test,
   g_free (service);
 
   /* Parameters */
-  parameters = tp_stream_tube_channel_get_parameters (test->tube);
-  /* NULL as the tube has not been offered yet */
-  g_assert (parameters == NULL);
-  g_object_get (test->tube, "parameters", &parameters, NULL);
-  g_assert (parameters == NULL);
   parameters_vardict = tp_stream_tube_channel_dup_parameters_vardict (
       test->tube);
   /* NULL as the tube has not been offered yet */
@@ -296,20 +286,17 @@ test_properties (Test *test,
       TP_SOCKET_ACCESS_CONTROL_LOCALHOST, FALSE);
 
   /* Parameters */
-  parameters = tp_stream_tube_channel_get_parameters (test->tube);
   parameters_vardict = tp_stream_tube_channel_dup_parameters_vardict (
       test->tube);
-  check_parameters (parameters, parameters_vardict);
+  check_parameters (parameters_vardict);
   g_variant_unref (parameters_vardict);
 
   g_object_get (test->tube,
-      "parameters", &parameters,
       "parameters-vardict", &parameters_vardict,
       NULL);
 
   g_assert (parameters_vardict != NULL);
-  check_parameters (parameters, parameters_vardict);
-  g_hash_table_unref (parameters);
+  check_parameters (parameters_vardict);
   g_variant_unref (parameters_vardict);
 }
 
@@ -594,15 +581,12 @@ test_offer_success (Test *test,
 
   params = tp_asv_new ("badger", G_TYPE_UINT, 42, NULL);
 
-  g_assert (tp_stream_tube_channel_get_parameters (test->tube) == NULL);
-
   tp_stream_tube_channel_offer_async (test->tube, params, tube_offer_cb, test);
   g_hash_table_unref (params);
 
   parameters_vardict = tp_stream_tube_channel_dup_parameters_vardict (
       test->tube);
-  check_parameters (tp_stream_tube_channel_get_parameters (test->tube),
-      parameters_vardict);
+  check_parameters (parameters_vardict);
   g_variant_unref (parameters_vardict);
 
   test->wait = 1;