[next] telepathy-glib: stream-tube: use the vardict version of the ' parameters' property

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Feb 19 14:24:12 2014 +0100

stream-tube: use the vardict version of the 'parameters' property

---

 telepathy-glib/stream-tube-channel.c |   30 ++----------------------------
 tests/dbus/stream-tube.c             |    4 ++--
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index f786856..93164fb 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -185,7 +185,6 @@ enum
 {
   PROP_SERVICE = 1,
   PROP_PARAMETERS,
-  PROP_PARAMETERS_VARDICT
 };
 
 enum /* signals */
@@ -301,10 +300,6 @@ tp_stream_tube_channel_get_property (GObject *object,
         break;
 
       case PROP_PARAMETERS:
-        g_value_set_boxed (value, self->priv->parameters);
-        break;
-
-      case PROP_PARAMETERS_VARDICT:
         g_value_take_variant (value,
             tp_stream_tube_channel_dup_parameters (self));
         break;
@@ -447,37 +442,17 @@ tp_stream_tube_channel_class_init (TpStreamTubeChannelClass *klass)
   /**
    * TpStreamTubeChannel:parameters:
    *
-   * A string to #GValue #GHashTable representing the parameters of the tube.
-   *
-   * Will be %NULL for outgoing tubes until the tube has been offered.
-   *
-   * In high-level language bindings, use
-   * #TpStreamTubeChannel:parameters-vardict or
-   * tp_stream_tube_channel_dup_parameters() to get the same
-   * information in a more convenient format.
-   *
-   * Since: 0.13.2
-   */
-  param_spec = g_param_spec_boxed ("parameters", "Parameters",
-      "The parameters of the stream tube",
-      TP_HASH_TYPE_STRING_VARIANT_MAP,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (gobject_class, PROP_PARAMETERS, param_spec);
-
-  /**
-   * TpStreamTubeChannel:parameters-vardict:
-   *
    * A %G_VARIANT_TYPE_VARDICT representing the parameters of the tube.
    *
    * Will be %NULL for outgoing tubes until the tube has been offered.
    *
    * Since: 0.19.10
    */
-  param_spec = g_param_spec_variant ("parameters-vardict", "Parameters",
+  param_spec = g_param_spec_variant ("parameters", "Parameters",
       "The parameters of the stream tube",
       G_VARIANT_TYPE_VARDICT, NULL,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (gobject_class, PROP_PARAMETERS_VARDICT,
+  g_object_class_install_property (gobject_class, PROP_PARAMETERS,
       param_spec);
 
   /**
@@ -1206,7 +1181,6 @@ _offer_with_address (TpStreamTubeChannel *self,
     self->priv->parameters = tp_asv_new (NULL, NULL);
 
   g_object_notify (G_OBJECT (self), "parameters");
-  g_object_notify (G_OBJECT (self), "parameters-vardict");
 
   /* Call Offer */
   tp_cli_channel_type_stream_tube1_call_offer (TP_CHANNEL (self), -1,
diff --git a/tests/dbus/stream-tube.c b/tests/dbus/stream-tube.c
index d4f06d5..80292c5 100644
--- a/tests/dbus/stream-tube.c
+++ b/tests/dbus/stream-tube.c
@@ -277,7 +277,7 @@ test_properties (Test *test,
   /* NULL as the tube has not been offered yet */
   g_assert (parameters_vardict == NULL);
   g_object_get (test->tube,
-      "parameters-vardict", &parameters_vardict,
+      "parameters", &parameters_vardict,
       NULL);
   g_assert (parameters_vardict == NULL);
 
@@ -292,7 +292,7 @@ test_properties (Test *test,
   g_variant_unref (parameters_vardict);
 
   g_object_get (test->tube,
-      "parameters-vardict", &parameters_vardict,
+      "parameters", &parameters_vardict,
       NULL);
 
   g_assert (parameters_vardict != NULL);