[tracker] Revert "libtracker-miner: Abort async operations once the ..."

[Debarshi Ray <debarshir src gnome org>]

commit 16b6ac1501f9d215c3107ec29fd9f0e39d249e22
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Oct 20 19:55:25 2015 +0200

    Revert "libtracker-miner: Abort async operations once the ..."
    
    Wrong bug URL.
    
    This reverts commit 864aabbe4d5c4fb7fd9b0813c25a337240df6235.

 src/libtracker-miner/tracker-file-notifier.c |   33 +++++++------------------
 1 files changed, 9 insertions(+), 24 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index 93b123b..50105aa 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -670,27 +670,19 @@ sparql_contents_query_cb (GObject      *object,
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
 
+       notifier = user_data;
+
        cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (object),
                                                         result, &error);
        if (error) {
-               if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                       goto out;
                g_warning ("Could not query directory contents: %s\n", error->message);
-       }
-
-       notifier = user_data;
-
-       if (cursor) {
+               g_error_free (error);
+       } else if (cursor) {
                sparql_contents_check_deleted (notifier, cursor);
                g_object_unref (cursor);
        }
 
        finish_current_directory (notifier, FALSE);
-
-out:
-       if (error) {
-               g_error_free (error);
-       }
 }
 
 static gchar *
@@ -753,18 +745,15 @@ sparql_files_query_cb (GObject      *object,
        TrackerSparqlCursor *cursor;
        GError *error = NULL;
 
+       notifier = data->notifier;
+       priv = notifier->priv;
+
        cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (object),
                                                         result, &error);
        if (error) {
-               if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-                       goto out;
                g_warning ("Could not query indexed files: %s\n", error->message);
-       }
-
-       notifier = data->notifier;
-       priv = notifier->priv;
-
-       if (cursor) {
+               g_error_free (error);
+       } else if (cursor) {
                sparql_files_query_populate (notifier, cursor, TRUE);
                g_object_unref (cursor);
        }
@@ -782,10 +771,6 @@ sparql_files_query_cb (GObject      *object,
                finish_current_directory (notifier, FALSE);
        }
 
-out:
-       if (error) {
-               g_error_free (error);
-       }
        g_free (data);
 }