Stop using TP_ERRORS

We deprecated this in 0.11.

1 files changed, 11 insertions, 11 deletions

diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index e58b38008..0704e2e20 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -1585,7 +1585,7 @@ context_prepare_cb (GObject *source,
   if (_tp_observe_channels_context_get_state (ctx) ==
       TP_OBSERVE_CHANNELS_CONTEXT_STATE_NONE)
     {
-      error = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+      error = g_error_new (TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Implementation of ObserveChannels in %s didn't call "
           "tp_observe_channels_context_{accept,fail,delay}",
           G_OBJECT_TYPE_NAME (self));
@@ -1718,7 +1718,7 @@ _tp_base_client_observe_channels (TpSvcClientObserver *iface,
 
   if (channels_arr->len == 0)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Channels should contain at least one channel");
       DEBUG ("%s", error->message);
       goto out;
@@ -1732,7 +1732,7 @@ _tp_base_client_observe_channels (TpSvcClientObserver *iface,
   connection = tp_account_ensure_connection (account, connection_path);
   if (connection == NULL)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Connection %s doesn't seem to exist. (Maybe the CM doesn't own "
           "the corresponding bus name?)", connection_path);
       DEBUG ("Failed to create TpConnection: %s", error->message);
@@ -1873,7 +1873,7 @@ add_dispatch_context_prepare_cb (GObject *source,
   if (_tp_add_dispatch_operation_context_get_state (ctx) ==
       TP_ADD_DISPATCH_OPERATION_CONTEXT_STATE_NONE)
     {
-      error = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+      error = g_error_new (TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Implementation of AddDispatchOperation in %s didn't call "
           "tp_add_dispatch_operation_context_{accept,fail,delay}",
           G_OBJECT_TYPE_NAME (self));
@@ -1928,7 +1928,7 @@ _tp_base_client_add_dispatch_operation (TpSvcClientApprover *iface,
       TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT);
   if (path == NULL)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Properties doesn't contain 'Account'");
       DEBUG ("%s", error->message);
       goto out;
@@ -1943,7 +1943,7 @@ _tp_base_client_add_dispatch_operation (TpSvcClientApprover *iface,
       TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION);
   if (path == NULL)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Properties doesn't contain 'Connection'");
       DEBUG ("%s", error->message);
       goto out;
@@ -1958,7 +1958,7 @@ _tp_base_client_add_dispatch_operation (TpSvcClientApprover *iface,
 
   if (channels_arr->len == 0)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Channels should contain at least one channel");
       DEBUG ("%s", error->message);
       goto out;
@@ -2230,7 +2230,7 @@ handle_channels_context_prepare_cb (GObject *source,
   if (_tp_handle_channels_context_get_state (ctx) ==
       TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE)
     {
-      error = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+      error = g_error_new (TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Implementation of HandledChannels in %s didn't call "
           "tp_handle_channels_context_{accept,fail,delay}",
           G_OBJECT_TYPE_NAME (self));
@@ -2301,7 +2301,7 @@ _tp_base_client_handle_channels (TpSvcClientHandler *iface,
 
   if (channels_arr->len == 0)
     {
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Channels should contain at least one channel");
       DEBUG ("%s", error->message);
       goto out;
@@ -2480,7 +2480,7 @@ _tp_base_client_add_request (TpSvcClientInterfaceRequests *iface,
   path = tp_asv_get_object_path (properties, TP_PROP_CHANNEL_REQUEST_ACCOUNT);
   if (path == NULL)
     {
-      error = g_error_new_literal (TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      error = g_error_new_literal (TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Mandatory 'Account' property is missing");
 
       DEBUG ("%s", error->message);
@@ -2528,7 +2528,7 @@ _tp_base_client_remove_request (TpSvcClientInterfaceRequests *iface,
   request = find_request_by_path (self, path);
   if (request == NULL)
     {
-      GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Uknown ChannelRequest" };
 
       dbus_g_method_return_error (context, &err);