[next] telepathy-glib: rename TpProtocol:protocol-properties-vardict

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Mon Mar 17 07:25:42 PDT 2014


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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Mar  6 14:22:41 2014 +0100

rename TpProtocol:protocol-properties-vardict

---

 telepathy-glib/protocol.c     |   10 +++++-----
 tests/dbus/protocol-objects.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 561429e..1775257 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -684,7 +684,7 @@ tp_protocol_class_init (TpProtocolClass *klass)
         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * TpProtocol:protocol-properties-vardict:
+   * TpProtocol:protocol-properties:
    *
    * The immutable properties of this Protocol, as provided at construction
    * time. This is a #G_VARIANT_TYPE_VARDICT #GVariant,
@@ -699,7 +699,7 @@ tp_protocol_class_init (TpProtocolClass *klass)
    */
   g_object_class_install_property (object_class,
       PROP_PROTOCOL_PROPERTIES_VARDICT,
-      g_param_spec_variant ("protocol-properties-vardict",
+      g_param_spec_variant ("protocol-properties",
         "Protocol properties",
         "The immutable properties of this Protocol",
         G_VARIANT_TYPE_VARDICT, NULL,
@@ -943,7 +943,7 @@ tp_protocol_new (TpDBusDaemon *dbus,
         "bus-name", bus_name,
         "object-path", object_path,
         "protocol-name", protocol_name,
-        "protocol-properties-vardict", immutable_properties,
+        "protocol-properties", immutable_properties,
         "cm-name", cm_name,
         NULL));
 
@@ -2329,10 +2329,10 @@ tp_protocol_dup_presence_statuses (TpProtocol *self)
  * tp_protocol_dup_immutable_properties:
  * @self: a #TpProtocol object
  *
- * Return the #TpProtocol:protocol-properties-vardict property.
+ * Return the #TpProtocol:protocol-propertiesproperty.
  *
  * Returns: (transfer full): the value of
- * #TpProtocol:protocol-properties-vardict
+ * #TpProtocol:protocol-properties
  * Since: UNRELEASED
  */
 GVariant *
diff --git a/tests/dbus/protocol-objects.c b/tests/dbus/protocol-objects.c
index 075a27a..0335303 100644
--- a/tests/dbus/protocol-objects.c
+++ b/tests/dbus/protocol-objects.c
@@ -401,7 +401,7 @@ test_protocol_object (Test *test,
   /* Create a new TpProtocol for the same protocol but by passing it all its
    * immutable properities */
   g_object_get (test->protocol,
-      "protocol-properties-vardict", &props,
+      "protocol-properties", &props,
       NULL);
 
   protocol = tp_protocol_new (test->dbus, "example_echo_2",



More information about the telepathy-commits mailing list