[next] telepathy-glib: rename tp_account_channel_request_new_vardict
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Thu Feb 27 06:07:34 PST 2014
Module: telepathy-glib
Branch: next
Commit: a8c670a007537e4112888bedfea8c85594ae457c
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=a8c670a007537e4112888bedfea8c85594ae457c
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Tue Feb 18 12:03:33 2014 +0100
rename tp_account_channel_request_new_vardict
---
.../telepathy-glib/telepathy-glib-sections.txt | 2 +-
examples/client/dbus-tubes/offerer.c | 2 +-
examples/client/stream-tubes/offerer.c | 2 +-
telepathy-glib/account-channel-request.c | 4 +--
telepathy-glib/account-channel-request.h | 2 +-
telepathy-glib/contact-search.c | 2 +-
telepathy-glib/room-list.c | 2 +-
tests/dbus/account-channel-request.c | 26 ++++++++++----------
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 7ee5c39..f333b87 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4952,7 +4952,7 @@ tp_svc_channel_type_contact_search1_get_type
<TITLE>account-channel-request</TITLE>
<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
TpAccountChannelRequest
-tp_account_channel_request_new_vardict
+tp_account_channel_request_new
tp_account_channel_request_get_request
tp_account_channel_request_dup_request
tp_account_channel_request_get_user_action_time
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index b6eb66f..db5165c 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -212,7 +212,7 @@ main (int argc,
g_message ("Offer channel to %s", argv[2]);
- req = tp_account_channel_request_new_vardict (account, request,
+ req = tp_account_channel_request_new (account, request,
TP_USER_ACTION_TIME_CURRENT_TIME);
tp_account_channel_request_create_and_handle_channel_async (req, NULL,
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index 8857d6a..20ceb5f 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -164,7 +164,7 @@ main (int argc,
g_message ("Offer channel to %s", argv[2]);
- req = tp_account_channel_request_new_vardict (account, request,
+ req = tp_account_channel_request_new (account, request,
TP_USER_ACTION_TIME_CURRENT_TIME);
tp_account_channel_request_create_and_handle_channel_async (req, NULL,
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index bc30b1f..79dad5d 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -519,7 +519,7 @@ tp_account_channel_request_class_init (
}
/**
- * tp_account_channel_request_new_vardict:
+ * tp_account_channel_request_new:
* @account: a #TpAccount
* @request: the requested
* properties of the channel (see #TpAccountChannelRequest:request)
@@ -540,7 +540,7 @@ tp_account_channel_request_class_init (
* Since: 0.19.10
*/
TpAccountChannelRequest *
-tp_account_channel_request_new_vardict (
+tp_account_channel_request_new (
TpAccount *account,
GVariant *request,
gint64 user_action_time)
diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h
index 08a53e1..bd57b41 100644
--- a/telepathy-glib/account-channel-request.h
+++ b/telepathy-glib/account-channel-request.h
@@ -62,7 +62,7 @@ GType tp_account_channel_request_get_type (void);
TpAccountChannelRequestClass))
_TP_AVAILABLE_IN_0_20
-TpAccountChannelRequest * tp_account_channel_request_new_vardict (
+TpAccountChannelRequest * tp_account_channel_request_new (
TpAccount *account,
GVariant *request,
gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/contact-search.c b/telepathy-glib/contact-search.c
index fb9286b..0aeb5f0 100644
--- a/telepathy-glib/contact-search.c
+++ b/telepathy-glib/contact-search.c
@@ -284,7 +284,7 @@ tp_contact_search_open_new_channel (TpContactSearch *self)
g_variant_dict_insert (&dict,
TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_LIMIT, "s", self->priv->limit);
- channel_request = tp_account_channel_request_new_vardict (self->priv->account,
+ channel_request = tp_account_channel_request_new (self->priv->account,
g_variant_dict_end (&dict), TP_USER_ACTION_TIME_NOT_USER_ACTION);
tp_account_channel_request_create_and_handle_channel_async (
diff --git a/telepathy-glib/room-list.c b/telepathy-glib/room-list.c
index 4f37f07..8c7cdbd 100644
--- a/telepathy-glib/room-list.c
+++ b/telepathy-glib/room-list.c
@@ -504,7 +504,7 @@ open_new_channel (TpRoomList *self)
g_variant_dict_insert (&dict,
TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER, "s", self->priv->server);
- channel_request = tp_account_channel_request_new_vardict (self->priv->account,
+ channel_request = tp_account_channel_request_new (self->priv->account,
g_variant_dict_end (&dict), TP_USER_ACTION_TIME_NOT_USER_ACTION);
tp_account_channel_request_create_and_handle_channel_async (channel_request,
diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
index 441e308..787e705 100644
--- a/tests/dbus/account-channel-request.c
+++ b/tests/dbus/account-channel-request.c
@@ -520,7 +520,7 @@ test_handle_cancel_before (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
g_cancellable_cancel (test->cancellable);
@@ -549,7 +549,7 @@ test_handle_cancel_after_create (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
tp_account_channel_request_ensure_and_handle_channel_async (req,
@@ -588,7 +588,7 @@ test_handle_re_handle (Test *test,
{
TpAccountChannelRequest *req, *req2;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
tp_account_channel_request_ensure_and_handle_channel_async (req,
@@ -601,7 +601,7 @@ test_handle_re_handle (Test *test,
G_CALLBACK (re_handled_cb), test);
/* Ensure the same channel to re-handle it */
- req2 = tp_account_channel_request_new_vardict (test->account,
+ req2 = tp_account_channel_request_new (test->account,
floating_request (), 666);
tp_account_channel_request_ensure_and_handle_channel_async (req2,
@@ -671,7 +671,7 @@ test_handle_create_success_hints (Test *test,
TpAccountChannelRequest *req;
GHashTable *hints;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
hints = create_hints ();
@@ -740,7 +740,7 @@ test_handle_delegated (Test *test,
TpBaseClient *base_client;
TpClient *client;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
/* Allow other clients to preempt the channel */
@@ -838,7 +838,7 @@ test_observe_create_success (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
tp_account_channel_request_create_channel_async (req, "Fake",
@@ -864,7 +864,7 @@ test_observe_create_fail (Test *test,
g_variant_dict_insert (&dict,
"CreateChannelFail", "b", TRUE);
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
g_variant_dict_end (&dict), 0);
tp_account_channel_request_create_channel_async (req, "Fake",
@@ -891,7 +891,7 @@ test_observe_proceed_fail (Test *test,
g_variant_dict_insert (&dict,
"ProceedFail", "b", TRUE);
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
g_variant_dict_end (&dict), 0);
tp_account_channel_request_create_channel_async (req, "Fake",
@@ -918,7 +918,7 @@ test_observe_cr_failed (Test *test,
g_variant_dict_insert (&dict,
"FireFailed", "b", TRUE);
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
g_variant_dict_end (&dict), 0);
tp_account_channel_request_create_channel_async (req, "Fake",
@@ -957,7 +957,7 @@ test_observe_ensure_success (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
tp_account_channel_request_ensure_channel_async (req, "Fake",
@@ -976,7 +976,7 @@ test_observe_cancel_before (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
g_cancellable_cancel (test->cancellable);
@@ -996,7 +996,7 @@ test_observe_cancel_after_create (Test *test,
{
TpAccountChannelRequest *req;
- req = tp_account_channel_request_new_vardict (test->account,
+ req = tp_account_channel_request_new (test->account,
floating_request (), 0);
tp_account_channel_request_create_channel_async (req, "Fake",
More information about the telepathy-commits
mailing list