[grilo-plugins/wip/carlosg/tracker3: 12/39] tracker3: Fold cancellable check with other error handling

[Carlos Garnacho <carlosg src gnome org>]

commit 48eb444ef3bd46f17d7f997253858077083ed13d
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 22 00:06:31 2020 +0200

    tracker3: Fold cancellable check with other error handling
    
    The cursor will already error out if the cancellable was cancelled.
    Check for that error and avoid checking the cancellable directly.

 src/tracker3/grl-tracker-source-api.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/src/tracker3/grl-tracker-source-api.c b/src/tracker3/grl-tracker-source-api.c
index e22e9100..932c93f7 100644
--- a/src/tracker3/grl-tracker-source-api.c
+++ b/src/tracker3/grl-tracker-source-api.c
@@ -332,17 +332,6 @@ get_sparql_type_filter (GrlOperationOptions *options,
                                                                         \
     GRL_ODEBUG ("%s", __FUNCTION__);                                    \
                                                                         \
-    if (g_cancellable_is_cancelled (os->cancel)) {                      \
-      GRL_ODEBUG ("\tOperation %u cancelled", spec->operation_id);      \
-      spec->callback (spec->source,                        \
-                      spec->operation_id,                               \
-                      NULL, 0,                                          \
-                      spec->user_data, NULL);                           \
-      grl_tracker_queue_done (grl_tracker_queue, os);                   \
-                                                                        \
-      return;                                                           \
-    }                                                                   \
-                                                                        \
     if (!tracker_sparql_cursor_next_finish (os->cursor,                 \
                                             result,                     \
                                             &tracker_error)) {          \
@@ -350,17 +339,18 @@ get_sparql_type_filter (GrlOperationOptions *options,
         GRL_WARNING ("\terror in parsing query id=%u : %s",             \
                      spec->operation_id, tracker_error->message);       \
                                                                         \
-        error = g_error_new (GRL_CORE_ERROR,                            \
-                             GRL_CORE_ERROR_##error##_FAILED,           \
-                             _("Failed to query: %s"),                  \
-                             tracker_error->message);                   \
+        if (!g_error_matches (tracker_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) \
+          error = g_error_new (GRL_CORE_ERROR,                          \
+                               GRL_CORE_ERROR_##error##_FAILED,         \
+                               _("Failed to query: %s"),                \
+                               tracker_error->message);                 \
                                                                         \
         spec->callback (spec->source,                      \
                         spec->operation_id,                             \
                         NULL, 0,                                        \
                         spec->user_data, error);                        \
                                                                         \
-        g_error_free (error);                                           \
+        g_clear_error (&error);                                         \
         g_error_free (tracker_error);                                   \
       } else {                                                          \
         GRL_ODEBUG ("\tend of parsing id=%u :)", spec->operation_id);   \