[next] telepathy-glib: tp_account_dup_parameters_vardict: rename

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Feb 18 14:47:25 2014 +0100

tp_account_dup_parameters_vardict: rename

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/account.c                                  |    6 ++----
 telepathy-glib/account.h                                  |    3 +--
 telepathy-logger/log-store-pidgin.c                       |    4 ++--
 tests/dbus/account.c                                      |    2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 260e723..14bb62a 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4018,7 +4018,7 @@ tp_account_get_changing_presence
 tp_account_get_current_presence
 tp_account_get_requested_presence
 tp_account_get_automatic_presence
-tp_account_dup_parameters_vardict
+tp_account_dup_parameters
 tp_account_get_nickname
 tp_account_set_nickname_async
 tp_account_set_nickname_finish
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index baf1e2b..1c791c4 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2371,7 +2371,7 @@ tp_account_get_icon_name (TpAccount *account)
 }
 
 /**
- * tp_account_dup_parameters_vardict:
+ * tp_account_dup_parameters:
  * @account: a #TpAccount
  *
  * Returns the parameters of the account, in a variant of type
@@ -2389,11 +2389,9 @@ tp_account_get_icon_name (TpAccount *account)
  *
  * Returns: (transfer full): the dictionary of
  *  parameters on @account, of type %G_VARIANT_TYPE_VARDICT
- *
- * Since: 0.17.6
  */
 GVariant *
-tp_account_dup_parameters_vardict (TpAccount *account)
+tp_account_dup_parameters (TpAccount *account)
 {
   g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
 
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index d061240..59d1394 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -202,8 +202,7 @@ TpConnectionPresenceType tp_account_get_requested_presence (
 TpConnectionPresenceType tp_account_get_automatic_presence (
     TpAccount *self, gchar **status, gchar **status_message);
 
-_TP_AVAILABLE_IN_0_18
-GVariant *tp_account_dup_parameters_vardict (TpAccount *account);
+GVariant * tp_account_dup_parameters (TpAccount *account);
 
 const gchar *tp_account_get_nickname (TpAccount *account);
 
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 336449b..8acd6cb 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -254,7 +254,7 @@ log_store_pidgin_get_dir (TplLogStore *self,
   GVariant *params;
   const gchar *account_param;
 
-  params = tp_account_dup_parameters_vardict (account);
+  params = tp_account_dup_parameters (account);
   protocol = tp_account_get_protocol_name (account);
 
   g_variant_lookup (params, "account", "&s", &account_param);
@@ -527,7 +527,7 @@ log_store_pidgin_dup_account (TplLogStorePidgin *self,
       if (tp_strdiff (tp_account_get_protocol_name (acc), protocol))
         continue;
 
-      params = tp_account_dup_parameters_vardict (acc);
+      params = tp_account_dup_parameters (acc);
 
       g_variant_lookup (params,
           "account", "&s", &account_param,
diff --git a/tests/dbus/account.c b/tests/dbus/account.c
index 48b0804..edf68aa 100644
--- a/tests/dbus/account.c
+++ b/tests/dbus/account.c
@@ -394,7 +394,7 @@ test_prepare_success (Test *test,
   assert_strprop (test->account, "display-name", "Fake Account");
   g_assert_cmpstr (tp_account_get_nickname (test->account), ==, "badger");
   assert_strprop (test->account, "nickname", "badger");
-  variant = tp_account_dup_parameters_vardict (test->account);
+  variant = tp_account_dup_parameters (test->account);
   g_assert_cmpstr (g_variant_get_type_string (variant), ==, "a{sv}");
   g_assert_cmpuint (g_variant_n_children (variant), ==, 0);
   g_variant_unref (variant);