[next] telepathy-glib: rename tp_connection_dup_detailed_error_vardict()

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Thu Feb 27 06:07:35 PST 2014


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

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

rename tp_connection_dup_detailed_error_vardict()

---

 .../reference/telepathy-glib/telepathy-glib-sections.txt |    2 +-
 telepathy-glib/connection.c                              |    4 ++--
 telepathy-glib/connection.h                              |    2 +-
 tests/dbus/connection-error.c                            |   14 +++++++-------
 tests/dbus/connection.c                                  |    4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 35427eb..d0ab07d 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -3286,7 +3286,7 @@ tp_connection_set_contact_info_async
 tp_connection_set_contact_info_finish
 TP_UNKNOWN_CONNECTION_STATUS
 TP_ERRORS_DISCONNECTED
-tp_connection_dup_detailed_error_vardict
+tp_connection_dup_detailed_error
 tp_connection_add_client_interest
 tp_connection_add_client_interest_by_id
 tp_connection_bind_connection_status_to_property
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index aff481f..160d43d 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -2606,7 +2606,7 @@ tp_connection_get_detailed_error (TpConnection *self,
 }
 
 /**
- * tp_connection_dup_detailed_error_vardict:
+ * tp_connection_dup_detailed_error:
  * @self: a connection
  * @details: (out) (allow-none) (transfer full):
  *  optionally used to return a %G_VARIANT_TYPE_VARDICT with details
@@ -2623,7 +2623,7 @@ tp_connection_get_detailed_error (TpConnection *self,
  * Since: 0.19.0
  */
 gchar *
-tp_connection_dup_detailed_error_vardict (TpConnection *self,
+tp_connection_dup_detailed_error (TpConnection *self,
     GVariant **details)
 {
   const GHashTable *asv;
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index 6d2b558..1959d58 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -183,7 +183,7 @@ gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
   TpConnectionPresenceType p2);
 
 _TP_AVAILABLE_IN_0_20
-gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,
+gchar *tp_connection_dup_detailed_error (TpConnection *self,
     GVariant **details) G_GNUC_WARN_UNUSED_RESULT;
 
 
diff --git a/tests/dbus/connection-error.c b/tests/dbus/connection-error.c
index 4fdb867..6be61b4 100644
--- a/tests/dbus/connection-error.c
+++ b/tests/dbus/connection-error.c
@@ -159,7 +159,7 @@ test_registered_error (Test *test,
   gchar *str;
 
   asv = GUINT_TO_POINTER (0xDEADBEEF);
-  g_assert_cmpstr (tp_connection_dup_detailed_error_vardict (test->conn, &asv),
+  g_assert_cmpstr (tp_connection_dup_detailed_error (test->conn, &asv),
       ==, NULL);
   g_assert_cmpuint (GPOINTER_TO_UINT (asv), ==, 0xDEADBEEF);
 
@@ -181,7 +181,7 @@ test_registered_error (Test *test,
   g_assert_error (error, example_com_error_quark (), DOMAIN_SPECIFIC_ERROR);
   g_assert (!ok);
 
-  str = tp_connection_dup_detailed_error_vardict (test->conn, &asv);
+  str = tp_connection_dup_detailed_error (test->conn, &asv);
   g_assert_cmpstr (str, ==, "com.example.DomainSpecificError");
   g_assert (asv != NULL);
   g_variant_unref (asv);
@@ -235,10 +235,10 @@ test_unregistered_error (Test *test,
   g_assert_error (error, TP_ERROR, TP_ERROR_NETWORK_ERROR);
   g_assert (!ok);
 
-  str = tp_connection_dup_detailed_error_vardict (test->conn, NULL);
+  str = tp_connection_dup_detailed_error (test->conn, NULL);
   g_assert_cmpstr (str, ==, "net.example.WTF");
   g_free (str);
-  str = tp_connection_dup_detailed_error_vardict (test->conn, &asv);
+  str = tp_connection_dup_detailed_error (test->conn, &asv);
   g_assert_cmpstr (str, ==, "net.example.WTF");
   g_assert (asv != NULL);
   g_variant_unref (asv);
@@ -271,7 +271,7 @@ test_detailed_error (Test *test,
   gint32 bees;
 
   asv = GUINT_TO_POINTER (0xDEADBEEF);
-  g_assert_cmpstr (tp_connection_dup_detailed_error_vardict (test->conn, &asv),
+  g_assert_cmpstr (tp_connection_dup_detailed_error (test->conn, &asv),
       ==, NULL);
   g_assert_cmpuint (GPOINTER_TO_UINT (asv), ==, 0xDEADBEEF);
 
@@ -302,10 +302,10 @@ test_detailed_error (Test *test,
 
   g_assert_error (error, example_com_error_quark (), DOMAIN_SPECIFIC_ERROR);
 
-  str = tp_connection_dup_detailed_error_vardict (test->conn, NULL);
+  str = tp_connection_dup_detailed_error (test->conn, NULL);
   g_assert_cmpstr (str, ==, "com.example.DomainSpecificError");
   g_free (str);
-  str = tp_connection_dup_detailed_error_vardict (test->conn, &variant);
+  str = tp_connection_dup_detailed_error (test->conn, &variant);
   g_assert_cmpstr (str, ==, "com.example.DomainSpecificError");
   g_free (str);
   g_assert (variant != NULL);
diff --git a/tests/dbus/connection.c b/tests/dbus/connection.c
index b655355..33f77fc 100644
--- a/tests/dbus/connection.c
+++ b/tests/dbus/connection.c
@@ -249,10 +249,10 @@ test_fail_to_prepare (Test *test,
   g_assert (!tp_proxy_is_prepared (test->conn,
         TP_CONNECTION_FEATURE_CONNECTED));
 
-  str = tp_connection_dup_detailed_error_vardict (test->conn, NULL);
+  str = tp_connection_dup_detailed_error (test->conn, NULL);
   g_assert_cmpstr (str, ==, TP_ERROR_STR_PERMISSION_DENIED);
   g_free (str);
-  str = tp_connection_dup_detailed_error_vardict (test->conn, &asv);
+  str = tp_connection_dup_detailed_error (test->conn, &asv);
   g_assert_cmpstr (str, ==, TP_ERROR_STR_PERMISSION_DENIED);
   g_assert (asv != NULL);
   g_free (str);



More information about the telepathy-commits mailing list