Use TP_ERROR instead of TP_ERRORS

The latter has been deprecated in tp-glib master.

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 14404bfe32392c4be62cab558c6ca9e0bd3d7697..e6019f8212cd4f690a6804b98058c2a57e67635c 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3700,7 +3700,7 @@ provide_password_cb (GObject *tp_chat,
                DEBUG ("error: %s", error->message);
                /* FIXME: what should we do if that's another error? Close the channel?
                 * Display the raw D-Bus error to the user isn't very useful */
-               if (g_error_matches (error, TP_ERRORS, TP_ERROR_AUTHENTICATION_FAILED)) {
+               if (g_error_matches (error, TP_ERROR, TP_ERROR_AUTHENTICATION_FAILED)) {
                        /* entry */
                        gtk_entry_set_text (GTK_ENTRY (data->entry), "");
                        gtk_widget_set_sensitive (data->entry, TRUE);
@@ -3927,7 +3927,7 @@ provide_saved_password_cb (GObject *tp_chat,
                DEBUG ("error: %s", error->message);
                /* FIXME: what should we do if that's another error? Close the channel?
                 * Display the raw D-Bus error to the user isn't very useful */
-               if (g_error_matches (error, TP_ERRORS, TP_ERROR_AUTHENTICATION_FAILED)) {
+               if (g_error_matches (error, TP_ERROR, TP_ERROR_AUTHENTICATION_FAILED)) {
                        display_password_info_bar (self);
                        gtk_widget_set_sensitive (priv->hpaned, FALSE);
                }

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 415aee0b2d812219a3c528525d10d72eccbc211d..f22da44d705f9ad65306b8f3833ae902e65c8309 100644 (file)
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -256,7 +256,7 @@ contact_blocking_dialog_set_error (EmpathyContactBlockingDialog *self,
 {
   const char *msg = NULL;
 
-  if (error->domain == TP_ERRORS)
+  if (error->domain == TP_ERROR)
     {
       if (error->code == TP_ERROR_INVALID_HANDLE)
         msg = _("Unknown or invalid identifier");

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 4e26a769b5f4e803ea37de5f62c43f06e0ca161a..e90f6ede2ce98a9509a880fb9df2720c931f49d1 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -492,7 +492,7 @@ message_sent_cb (TpTextChannel   *channel,
 static TpChannelTextSendError
 error_to_text_send_error (GError *error)
 {
-       if (error->domain != TP_ERRORS)
+       if (error->domain != TP_ERROR)
                return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN;
 
        switch (error->code) {

diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 681c882eec72e6753eba8af23c6824bb7bf62a59..111e3190a34b38e38236a067a7761f80e2f345a9 100644 (file)
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -298,7 +298,7 @@ get_contact_by_handle_cb (TpConnection *connection,
                         * so the caller of empathy_tp_contact_factory_get_from_handle can
                         * rely on the error to check if the operation succeeded or not. */
 
-                       err = g_error_new_literal (TP_ERRORS, TP_ERROR_INVALID_HANDLE,
+                       err = g_error_new_literal (TP_ERROR, TP_ERROR_INVALID_HANDLE,
                                                      "handle is invalid");
                }
                else {

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 95c828d94d43fddcfbd8be4c0171152123eb03b4..783c44e951933ef33e2a50ae1f32702c9f906116 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -268,7 +268,7 @@ approve_channels (TpBaseClient *client,
   EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
   TpCallChannel *channel;
   guint handle;
-  GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" };
+  GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "" };
   gboolean handled = FALSE;
 
   channel = find_call_channel (channels);

diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 2019cd02f60433cc3df53bc9db78d00f3b4ba8f4..35ceeb046ee8d91a53ed55e0dfe3a73f9681f979 100644 (file)
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -252,7 +252,7 @@ observe_channels (TpSimpleObserver *observer,
   channel = find_main_channel (channels);
   if (channel == NULL)
     {
-      GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Unknown channel type" };
 
       DEBUG ("Didn't find any Call or StreamedMedia channel; ignoring");

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c6b3e29edfd64117e08f16816d616cdd92782493..33854974bd1ef65484c9242cb7157b506c300906 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -294,7 +294,7 @@ handle_with_time_cb (GObject *source,
   if (!tp_channel_dispatch_operation_handle_with_time_finish (cdo, result,
         &error))
     {
-      if (g_error_matches (error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED))
+      if (g_error_matches (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED))
         {
           EventManagerApproval *approval = user_data;
 
@@ -1011,7 +1011,7 @@ approve_channels (TpSimpleApprover *approver,
   channel = find_main_channel (channels);
   if (channel == NULL)
     {
-      GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Unknown channel type" };
 
       DEBUG ("Failed to find the main channel; ignoring");
@@ -1148,7 +1148,7 @@ approve_channels (TpSimpleApprover *approver,
         }
       else
         {
-          GError error = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+          GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
               "Support only X-TELEPATHY-PASSWORD auth method" };
 
           tp_add_dispatch_operation_context_fail (context, &error);
@@ -1157,7 +1157,7 @@ approve_channels (TpSimpleApprover *approver,
     }
   else
     {
-      GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Invalid channel type" };
 
       DEBUG ("Unknown channel type (%s), ignoring..",