[next] telepathy-glib: rename tp_protocol_new_vardict()

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Mar  3 16:47:10 2014 +0100

rename tp_protocol_new_vardict()

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/connection-manager.c                       |    4 ++--
 telepathy-glib/protocol.c                                 |    4 ++--
 telepathy-glib/protocol.h                                 |    2 +-
 tests/dbus/protocol-objects.c                             |    8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index c6e44d0..588034c 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4844,7 +4844,7 @@ TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS1
 <TITLE>protocol</TITLE>
 TpProtocol
 TpProtocolClass
-tp_protocol_new_vardict
+tp_protocol_new
 tp_protocol_get_name
 tp_protocol_get_cm_name
 tp_protocol_init_known_interfaces
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 060716f..5ae29b9 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -384,7 +384,7 @@ tp_connection_manager_get_all_cb (TpProxy *proxy,
 
               if (tp_connection_manager_check_valid_protocol_name (name, NULL))
                 {
-                  TpProtocol *proto_object = tp_protocol_new_vardict (
+                  TpProtocol *proto_object = tp_protocol_new (
                       tp_proxy_get_dbus_daemon (self), self->priv->name, name,
                       tp_asv_to_vardict (v), NULL);
 
@@ -627,7 +627,7 @@ tp_connection_manager_read_file (TpDBusDaemon *dbus_daemon,
       if (immutables == NULL)
         continue;
 
-      proto_object = tp_protocol_new_vardict (dbus_daemon, cm_name, name,
+      proto_object = tp_protocol_new (dbus_daemon, cm_name, name,
           tp_asv_to_vardict (immutables), NULL);
       g_assert (proto_object != NULL);
 
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index dfc8aa1..9a14475 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -913,7 +913,7 @@ tp_protocol_init (TpProtocol *self)
 }
 
 /**
- * tp_protocol_new_vardict:
+ * tp_protocol_new:
  * @dbus: proxy for the D-Bus daemon; may not be %NULL
  * @cm_name: the connection manager name (such as "gabble")
  * @protocol_name: the protocol name (such as "jabber")
@@ -932,7 +932,7 @@ tp_protocol_init (TpProtocol *self)
  * Since: 0.UNRELEASED
  */
 TpProtocol *
-tp_protocol_new_vardict (TpDBusDaemon *dbus,
+tp_protocol_new (TpDBusDaemon *dbus,
     const gchar *cm_name,
     const gchar *protocol_name,
     GVariant *immutable_properties,
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index 1f7b162..7acefae 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -67,7 +67,7 @@ struct _TpProtocol
 
 void tp_protocol_init_known_interfaces (void);
 
-TpProtocol * tp_protocol_new_vardict (TpDBusDaemon *dbus,
+TpProtocol * tp_protocol_new (TpDBusDaemon *dbus,
     const gchar *cm_name,
     const gchar *protocol_name,
     GVariant *immutable_properties,
diff --git a/tests/dbus/protocol-objects.c b/tests/dbus/protocol-objects.c
index 8848e4d..075a27a 100644
--- a/tests/dbus/protocol-objects.c
+++ b/tests/dbus/protocol-objects.c
@@ -125,7 +125,7 @@ test_protocol_properties (Test *test,
   GValueArray *va;
   GHashTable *fixed;
 
-  test->protocol = tp_protocol_new_vardict (test->dbus, "example_echo_2",
+  test->protocol = tp_protocol_new (test->dbus, "example_echo_2",
       "example", NULL, NULL);
   g_assert (test->protocol != NULL);
 
@@ -175,7 +175,7 @@ test_protocol_avatar_properties (Test *test,
   gboolean is_set;
   guint num;
 
-  test->protocol = tp_protocol_new_vardict (test->dbus, "example_echo_2",
+  test->protocol = tp_protocol_new (test->dbus, "example_echo_2",
       "example", NULL, NULL);
   g_assert (test->protocol != NULL);
 
@@ -222,7 +222,7 @@ test_protocol_addressing_properties (Test *test,
 {
   GHashTable *properties = NULL;
 
-  test->protocol = tp_protocol_new_vardict (test->dbus, "example_echo_2",
+  test->protocol = tp_protocol_new (test->dbus, "example_echo_2",
       "example", NULL, NULL);
   g_assert (test->protocol != NULL);
 
@@ -404,7 +404,7 @@ test_protocol_object (Test *test,
       "protocol-properties-vardict", &props,
       NULL);
 
-  protocol = tp_protocol_new_vardict (test->dbus, "example_echo_2",
+  protocol = tp_protocol_new (test->dbus, "example_echo_2",
       "example", props, &test->error);
   g_assert_no_error (test->error);
   g_assert (TP_IS_PROTOCOL (protocol));