[grilo-plugins/wip/carlosg/tracker3: 16/48] tracker3: Drop cursor argument from GrlTrackerOp

[Jean Felder <jfelder src gnome org>]

commit f87957e239bc09e824f55a43328366ed319ca2e5
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 22 00:13:50 2020 +0200

    tracker3: Drop cursor argument from GrlTrackerOp
    
    The operation is passed as data to the cursor asynchronous method,
    so it's already implicitly attached to it.

 src/tracker3/grl-tracker-request-queue.c |  1 -
 src/tracker3/grl-tracker-request-queue.h |  2 --
 src/tracker3/grl-tracker-source-api.c    | 17 ++++++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/tracker3/grl-tracker-request-queue.c b/src/tracker3/grl-tracker-request-queue.c
index ac9f42ea..698e120d 100644
--- a/src/tracker3/grl-tracker-request-queue.c
+++ b/src/tracker3/grl-tracker-request-queue.c
@@ -44,7 +44,6 @@ grl_tracker_op_terminate (GrlTrackerOp *os)
 
   g_clear_object (&os->statement);
   g_clear_pointer (&os->arguments, g_hash_table_unref);
-  g_clear_object (&os->cursor);
   g_object_unref (os->cancel);
   g_free (os->request);
 
diff --git a/src/tracker3/grl-tracker-request-queue.h b/src/tracker3/grl-tracker-request-queue.h
index 20dcc8fc..ffede6cf 100644
--- a/src/tracker3/grl-tracker-request-queue.h
+++ b/src/tracker3/grl-tracker-request-queue.h
@@ -46,8 +46,6 @@ typedef struct {
   const GList             *keys;
   gpointer                 data;
 
-  TrackerSparqlCursor *cursor;
-
   guint operation_id;
 
   guint skip;
diff --git a/src/tracker3/grl-tracker-source-api.c b/src/tracker3/grl-tracker-source-api.c
index 932c93f7..48e2b051 100644
--- a/src/tracker3/grl-tracker-source-api.c
+++ b/src/tracker3/grl-tracker-source-api.c
@@ -323,6 +323,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
                               GAsyncResult *result,                     \
                               GrlTrackerOp *os)                         \
   {                                                                     \
+    TrackerSparqlCursor *cursor = TRACKER_SPARQL_CURSOR (source_object);\
     gint         col;                                                   \
     const gchar *sparql_type;                                           \
     GError      *tracker_error = NULL, *error = NULL;                   \
@@ -332,7 +333,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
                                                                         \
     GRL_ODEBUG ("%s", __FUNCTION__);                                    \
                                                                         \
-    if (!tracker_sparql_cursor_next_finish (os->cursor,                 \
+    if (!tracker_sparql_cursor_next_finish (cursor,                     \
                                             result,                     \
                                             &tracker_error)) {          \
       if (tracker_error != NULL) {                                      \
@@ -362,10 +363,11 @@ get_sparql_type_filter (GrlOperationOptions *options,
       }                                                                 \
                                                                         \
       grl_tracker_queue_done (grl_tracker_queue, os);                   \
+      g_object_unref (cursor);                                          \
       return;                                                           \
     }                                                                   \
                                                                         \
-    sparql_type = tracker_sparql_cursor_get_string (os->cursor,         \
+    sparql_type = tracker_sparql_cursor_get_string (cursor,             \
                                                     0,                  \
                                                     NULL);              \
                                                                         \
@@ -376,10 +378,10 @@ get_sparql_type_filter (GrlOperationOptions *options,
                                                                         \
     if (media != NULL) {                                                \
       for (col = 1 ;                                                    \
-           col < tracker_sparql_cursor_get_n_columns (os->cursor) ;     \
+           col < tracker_sparql_cursor_get_n_columns (cursor) ;         \
            col++) {                                                     \
         fill_grilo_media_from_sparql (GRL_TRACKER_SOURCE (spec->source), \
-                                      media, os->cursor, col);          \
+                                      media, cursor, col);              \
       }                                                                 \
       set_title_from_filename (media);                                  \
                                                                         \
@@ -392,7 +394,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
     }                                                                   \
                                                                         \
     /* Schedule the next row to parse */                                \
-    tracker_sparql_cursor_next_async (os->cursor, os->cancel,           \
+    tracker_sparql_cursor_next_async (cursor, os->cancel,               \
                                       (GAsyncReadyCallback) tracker_##name##_result_cb, \
                                       (gpointer) os);                   \
   }                                                                     \
@@ -404,10 +406,11 @@ get_sparql_type_filter (GrlOperationOptions *options,
   {                                                                     \
     GError *tracker_error = NULL, *error = NULL;                        \
     spec_type *spec = (spec_type *) os->data;                           \
+    TrackerSparqlCursor *cursor;                                        \
                                                                         \
     GRL_ODEBUG ("%s", __FUNCTION__);                                    \
                                                                         \
-    os->cursor =                                                        \
+    cursor =                                                            \
       tracker_sparql_statement_execute_finish (os->statement,           \
                                                result, &tracker_error); \
                                                                         \
@@ -431,7 +434,7 @@ get_sparql_type_filter (GrlOperationOptions *options,
     }                                                                   \
                                                                         \
     /* Start parsing results */                                         \
-    tracker_sparql_cursor_next_async (os->cursor, NULL,                 \
+    tracker_sparql_cursor_next_async (cursor, NULL,                     \
                                       (GAsyncReadyCallback) tracker_##name##_result_cb, \
                                       (gpointer) os);                   \
   }