From 6de9c8cb29a93d826b9718169469c2010feac987 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Wed, 9 Oct 2019 10:48:28 +0200
Subject: [PATCH] base-bearer: avoid using MM_CORE_ERROR_CANCELLED

---
 src/mm-base-bearer.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mm-base-bearer.c b/src/mm-base-bearer.c
index 9808eb4c..f8323231 100644
--- a/src/mm-base-bearer.c
+++ b/src/mm-base-bearer.c
@@ -724,8 +724,7 @@ connect_ready (MMBaseBearer *self,
         mm_dbg ("Couldn't connect bearer '%s': '%s'",
                 self->priv->path,
                 error->message);
-        if (   g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED)
-            || g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+        if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
             /* Will launch disconnection */
             launch_disconnect = TRUE;
         } else
@@ -735,10 +734,8 @@ connect_ready (MMBaseBearer *self,
     else if (g_cancellable_is_cancelled (self->priv->connect_cancellable)) {
         mm_dbg ("Connected bearer '%s', but need to disconnect", self->priv->path);
         mm_bearer_connect_result_unref (result);
-        error = g_error_new (
-            MM_CORE_ERROR,
-            MM_CORE_ERROR_CANCELLED,
-            "Bearer got connected, but had to disconnect after cancellation request");
+        error = g_error_new (G_IO_ERROR, G_IO_ERROR_CANCELLED,
+                             "Bearer got connected, but had to disconnect after cancellation request");
         launch_disconnect = TRUE;
     }
     else {