[next] telepathy-glib: tp_client_factory_dup_channel_dispatcher: rename to _ensure_channel_dispatcher

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr  1 14:29:14 2014 +0100

tp_client_factory_dup_channel_dispatcher: rename to _ensure_channel_dispatcher

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/account-channel-request.c                  |    4 ++--
 telepathy-glib/base-client.c                              |    2 +-
 telepathy-glib/client-factory.c                           |    4 ++--
 telepathy-glib/client-factory.h                           |    2 +-
 tests/dbus/base-client.c                                  |    2 +-
 tests/dbus/channel-dispatcher.c                           |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index cd6cd7c..c8de563 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -5730,7 +5730,7 @@ tp_client_factory_get_dbus_daemon
 tp_client_factory_get_dbus_connection
 <SUBSECTION>
 tp_client_factory_ensure_account_manager
-tp_client_factory_dup_channel_dispatcher
+tp_client_factory_ensure_channel_dispatcher
 <SUBSECTION>
 tp_client_factory_ensure_account
 tp_client_factory_dup_account_features
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index e7259fb..1ec8a50 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -963,7 +963,7 @@ request_and_handle_channel_async (TpAccountChannelRequest *self,
       return;
     }
 
-  cd = tp_client_factory_dup_channel_dispatcher (tp_proxy_get_factory (
+  cd = tp_client_factory_ensure_channel_dispatcher (tp_proxy_get_factory (
       self->priv->account));
 
   hints = tp_asv_from_vardict (self->priv->hints);
@@ -1200,7 +1200,7 @@ request_channel_async (TpAccountChannelRequest *self,
         callback, user_data))
     return;
 
-  cd = tp_client_factory_dup_channel_dispatcher (tp_proxy_get_factory (
+  cd = tp_client_factory_ensure_channel_dispatcher (tp_proxy_get_factory (
       self->priv->account));
 
   hints = tp_asv_from_vardict (self->priv->hints);
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index bfb39cc..5024cb7 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -2832,7 +2832,7 @@ tp_base_client_delegate_channels_async (TpBaseClient *self,
   g_return_if_fail (TP_IS_BASE_CLIENT (self));
   g_return_if_fail (self->priv->flags & CLIENT_IS_HANDLER);
 
-  cd = tp_client_factory_dup_channel_dispatcher (self->priv->factory);
+  cd = tp_client_factory_ensure_channel_dispatcher (self->priv->factory);
 
   chans = g_ptr_array_new_full (g_list_length (channels), g_free);
 
diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index 9830b83..3487ab9 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -652,7 +652,7 @@ tp_client_factory_ensure_account_manager (TpClientFactory *self)
 }
 
 /**
- * tp_client_factory_dup_channel_dispatcher:
+ * tp_client_factory_ensure_channel_dispatcher:
  * @self: a #TpClientFactory object
  *
  * <!-- -->
@@ -662,7 +662,7 @@ tp_client_factory_ensure_account_manager (TpClientFactory *self)
  * Since: 0.UNRELEASED
  */
 TpChannelDispatcher *
-tp_client_factory_dup_channel_dispatcher (TpClientFactory *self)
+tp_client_factory_ensure_channel_dispatcher (TpClientFactory *self)
 {
   TpChannelDispatcher *channel_dispatcher;
 
diff --git a/telepathy-glib/client-factory.h b/telepathy-glib/client-factory.h
index f9eb0a5..d593245 100644
--- a/telepathy-glib/client-factory.h
+++ b/telepathy-glib/client-factory.h
@@ -135,7 +135,7 @@ GDBusConnection *tp_client_factory_get_dbus_connection (TpClientFactory *self);
 
 TpAccountManager *tp_client_factory_ensure_account_manager (
     TpClientFactory *self);
-TpChannelDispatcher *tp_client_factory_dup_channel_dispatcher (
+TpChannelDispatcher *tp_client_factory_ensure_channel_dispatcher (
     TpClientFactory *self);
 
 /* TpAccount */
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index c051476..08f6883 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -1268,7 +1268,7 @@ test_present_channel (Test *test,
 {
   TpChannelDispatcher *cd;
 
-  cd = tp_client_factory_dup_channel_dispatcher (test->factory);
+  cd = tp_client_factory_ensure_channel_dispatcher (test->factory);
 
   tp_channel_dispatcher_present_channel_async (cd, test->text_chan,
       TP_USER_ACTION_TIME_CURRENT_TIME, present_channel_cb, test);
diff --git a/tests/dbus/channel-dispatcher.c b/tests/dbus/channel-dispatcher.c
index be8375a..ba8f0f7 100644
--- a/tests/dbus/channel-dispatcher.c
+++ b/tests/dbus/channel-dispatcher.c
@@ -61,7 +61,7 @@ test_new (Test *test,
   TpClientFactory *factory;
 
   factory = tp_client_factory_new (test->dbus);
-  test->cd = tp_client_factory_dup_channel_dispatcher (factory);
+  test->cd = tp_client_factory_ensure_channel_dispatcher (factory);
   g_assert (test->cd != NULL);
   g_object_unref (factory);
 }