[next] telepathy-glib: rename tp_account_dup_detailed_error_vardict()

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Feb 18 12:17:31 2014 +0100

rename tp_account_dup_detailed_error_vardict()

---

 docs/reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/account.c                                  |    6 ++----
 telepathy-glib/account.h                                  |    3 +--
 tests/dbus/account.c                                      |   10 +++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 917a757..f8e3127 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -4013,7 +4013,7 @@ tp_account_set_connect_automatically_async
 tp_account_set_connect_automatically_finish
 tp_account_get_has_been_online
 tp_account_get_connection_status
-tp_account_dup_detailed_error_vardict
+tp_account_dup_detailed_error
 tp_account_get_changing_presence
 tp_account_get_current_presence
 tp_account_get_requested_presence
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 88fa744..4d937bb 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -3701,7 +3701,7 @@ tp_account_set_avatar_async (TpAccount *self,
 }
 
 /**
- * tp_account_dup_detailed_error_vardict:
+ * tp_account_dup_detailed_error:
  * @self: an account
  * @details: (out) (allow-none) (transfer full):
  *  optionally used to return a variant of type %G_VARIANT_TYPE_VARDICT,
@@ -3721,11 +3721,9 @@ tp_account_set_avatar_async (TpAccount *self,
  * re-entered or the account is destroyed.
  *
  * Returns: (transfer full) (allow-none): a D-Bus error name, or %NULL.
- *
- * Since: 0.17.6
  */
 gchar *
-tp_account_dup_detailed_error_vardict (TpAccount *self,
+tp_account_dup_detailed_error (TpAccount *self,
     GVariant **details)
 {
   g_return_val_if_fail (TP_IS_ACCOUNT (self), NULL);
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index e4e0c49..9c77dc4 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -190,8 +190,7 @@ gboolean tp_account_get_has_been_online (TpAccount *account);
 TpConnectionStatus tp_account_get_connection_status (TpAccount *account,
     TpConnectionStatusReason *reason);
 
-_TP_AVAILABLE_IN_0_18
-gchar *tp_account_dup_detailed_error_vardict (TpAccount *self,
+gchar *tp_account_dup_detailed_error (TpAccount *self,
     GVariant **details);
 
 TpConnectionPresenceType tp_account_get_current_presence (TpAccount *account,
diff --git a/tests/dbus/account.c b/tests/dbus/account.c
index d120238..4145d43 100644
--- a/tests/dbus/account.c
+++ b/tests/dbus/account.c
@@ -413,10 +413,10 @@ test_prepare_success (Test *test,
   g_assert_cmpint (reason, ==, TP_CONNECTION_STATUS_REASON_REQUESTED);
   assert_uintprop (test->account, "connection-status-reason",
       TP_CONNECTION_STATUS_REASON_REQUESTED);
-  g_assert_cmpstr (tp_account_dup_detailed_error_vardict (test->account, NULL),
+  g_assert_cmpstr (tp_account_dup_detailed_error (test->account, NULL),
       ==, NULL);
   assert_strprop (test->account, "connection-error", NULL);
-  g_assert_cmpstr (tp_account_dup_detailed_error_vardict (
+  g_assert_cmpstr (tp_account_dup_detailed_error (
         test->account, &details), ==, NULL);
   /* this is documented to be untouched */
   g_assert_cmpuint (GPOINTER_TO_UINT (details), ==, 666);
@@ -766,7 +766,7 @@ test_connection (Test *test,
   g_assert_cmpstr (tp_proxy_get_object_path (conn), ==, conn1_path);
   g_assert_cmpuint (test_get_times_notified (test, "connection"), ==, 1);
 
-  g_assert_cmpstr (tp_account_dup_detailed_error_vardict (test->account, NULL),
+  g_assert_cmpstr (tp_account_dup_detailed_error (test->account, NULL),
       ==, TP_ERROR_STR_CANCELLED);
 
   /* a no-op "change" */
@@ -815,7 +815,7 @@ test_connection (Test *test,
   conn = tp_account_get_connection (test->account);
   g_assert (conn == NULL);
 
-  g_assert_cmpstr (tp_account_dup_detailed_error_vardict (test->account, NULL),
+  g_assert_cmpstr (tp_account_dup_detailed_error (test->account, NULL),
       ==, TP_ERROR_STR_ENCRYPTION_ERROR);
 
   /* another connection */
@@ -849,7 +849,7 @@ test_connection (Test *test,
   g_assert_cmpuint (test_get_times_notified (test, "connection"), ==, 1);
   g_assert_cmpuint (test_get_times_notified (test, "connection-error"), ==, 1);
 
-  s = tp_account_dup_detailed_error_vardict (test->account, &details_v);
+  s = tp_account_dup_detailed_error (test->account, &details_v);
   g_assert_cmpstr (s, ==, "org.debian.packages.OpenSSL.NotRandomEnough");
   g_free (s);
   g_assert_cmpuint (g_variant_n_children (details_v), >=, 2);