[next] telepathy-glib: Use TP_ERROR instead of TP_ERRORS

[Xavier Claessens]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu May  3 14:27:50 2012 +0200

Use TP_ERROR instead of TP_ERRORS

---

 telepathy-glib/tls-certificate.c |    2 +-
 tests/dbus/tls-certificate.c     |   10 +++++-----
 tests/lib/tls-certificate.c      |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index cd23e19..07fccce 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -822,7 +822,7 @@ tp_tls_certificate_init_known_interfaces (void)
       tp_proxy_or_subclass_hook_on_interface_add (tp_type,
           tp_cli_tls_cert_add_signals);
       tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR);
+          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
 
       g_once_init_leave (&once, 1);
     }
diff --git a/tests/dbus/tls-certificate.c b/tests/dbus/tls-certificate.c
index 01762b4..752ea6d 100644
--- a/tests/dbus/tls-certificate.c
+++ b/tests/dbus/tls-certificate.c
@@ -260,7 +260,7 @@ test_reject (Test *test,
   reason = tp_tls_certificate_rejection_get_reason (rej);
   details = tp_tls_certificate_rejection_get_details (rej);
 
-  g_assert_error (error, TP_ERRORS, TP_ERROR_CERT_REVOKED);
+  g_assert_error (error, TP_ERROR, TP_ERROR_CERT_REVOKED);
   g_assert_cmpstr (dbus_error, ==, TP_ERROR_STR_CERT_REVOKED);
   g_assert_cmpuint (reason, ==, TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED);
   g_assert (g_variant_is_of_type (details, G_VARIANT_TYPE_VARDICT));
@@ -269,7 +269,7 @@ test_reject (Test *test,
   g_assert (enabled);
 
   g_assert (!tp_tls_certificate_rejection_raise_error (rej, &err));
-  g_assert_error (err, TP_ERRORS, TP_ERROR_CERT_REVOKED);
+  g_assert_error (err, TP_ERROR, TP_ERROR_CERT_REVOKED);
   g_error_free (err);
 
   rej = tp_tls_certificate_get_nth_rejection (test->cert, 1);
@@ -278,7 +278,7 @@ test_reject (Test *test,
   dbus_error = tp_tls_certificate_rejection_get_dbus_error (rej);
   details = tp_tls_certificate_rejection_get_details (rej);
 
-  g_assert_error (error, TP_ERRORS, TP_ERROR_CAPTCHA_NOT_SUPPORTED);
+  g_assert_error (error, TP_ERROR, TP_ERROR_CAPTCHA_NOT_SUPPORTED);
   g_assert_cmpstr (dbus_error, ==, TP_ERROR_STR_CAPTCHA_NOT_SUPPORTED);
   g_assert (g_variant_is_of_type (details, G_VARIANT_TYPE_VARDICT));
   g_assert_cmpuint (g_variant_n_children (details), ==, 0);
@@ -298,7 +298,7 @@ test_reject (Test *test,
   dbus_error = tp_tls_certificate_rejection_get_dbus_error (rej);
   details = tp_tls_certificate_rejection_get_details (rej);
 
-  g_assert_error (error, TP_ERRORS, TP_ERROR_CERT_INVALID);
+  g_assert_error (error, TP_ERROR, TP_ERROR_CERT_INVALID);
   g_assert_cmpstr (dbus_error, ==, TP_ERROR_STR_CERT_INVALID);
   g_assert (g_variant_is_of_type (details, G_VARIANT_TYPE_VARDICT));
   g_assert_cmpuint (g_variant_n_children (details), ==, 0);
@@ -330,7 +330,7 @@ test_invalidated (Test *test,
 
   disconnect_conn (test);
 
-  g_assert_error (test->error, TP_ERRORS, TP_ERROR_CANCELLED);
+  g_assert_error (test->error, TP_ERROR, TP_ERROR_CANCELLED);
 }
 
 int
diff --git a/tests/lib/tls-certificate.c b/tests/lib/tls-certificate.c
index 052cd39..8a936e9 100644
--- a/tests/lib/tls-certificate.c
+++ b/tests/lib/tls-certificate.c
@@ -266,7 +266,7 @@ tp_tests_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert,
   if (self->priv->cert_state != TP_TLS_CERTIFICATE_STATE_PENDING)
     {
       GError error =
-        { TP_ERRORS,
+        { TP_ERROR,
           TP_ERROR_INVALID_ARGUMENT,
           "Calling Accept() on a certificate with state != PENDING "
           "doesn't make sense."
@@ -295,7 +295,7 @@ tp_tests_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert,
 
   if (rejections->len < 1)
     {
-      GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Calling Reject() with a zero-length rejection list." };
 
       dbus_g_method_return_error (context, &error);
@@ -305,7 +305,7 @@ tp_tests_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert,
   if (self->priv->cert_state != TP_TLS_CERTIFICATE_STATE_PENDING)
     {
       GError error =
-        { TP_ERRORS,
+        { TP_ERROR,
           TP_ERROR_INVALID_ARGUMENT,
           "Calling Reject() on a certificate with state != PENDING "
           "doesn't make sense."