[nautilus/sam/tracker-3: 1/8] tag-manager: Fix checks for cancellation
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/sam/tracker-3: 1/8] tag-manager: Fix checks for cancellation
- Date: Tue, 25 Aug 2020 08:37:40 +0000 (UTC)
commit 3c54ce9b002b70e3c0af80479c30be984863fcf0
Author: Sam Thursfield <sam afuera me uk>
Date: Sun May 3 20:18:03 2020 +0200
tag-manager: Fix checks for cancellation
Only process query results if there's no error.
Fix some checks so that we report errors except for
G_IO_ERROR_CANCELLED, which happens normally as part of
nautilus_application_finalize().
src/nautilus-tag-manager.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
index 78c81e0b6..8ccc181a5 100644
--- a/src/nautilus-tag-manager.c
+++ b/src/nautilus-tag-manager.c
@@ -245,8 +245,7 @@ on_update_callback (GObject *object,
tracker_sparql_connection_update_finish (connection, result, &error);
- if (error == NULL ||
- (error != NULL && error->code != G_IO_ERROR_CANCELLED))
+ if (error == NULL)
{
for (l = data->selection; l != NULL; l = l->next)
{
@@ -287,7 +286,7 @@ on_update_callback (GObject *object,
g_task_return_boolean (data->task, TRUE);
g_object_unref (data->task);
}
- else if (error && error->code == G_IO_ERROR_CANCELLED)
+ if (error && error->code == G_IO_ERROR_CANCELLED)
{
g_error_free (error);
}
@@ -330,7 +329,7 @@ get_query_status (TrackerSparqlCursor *cursor,
g_clear_object (&cursor);
if (error == NULL ||
- (error != NULL && error->code != G_IO_ERROR_CANCELLED))
+ (error != NULL && error->code == G_IO_ERROR_CANCELLED))
{
if (op_type == GET_IDS_FOR_URLS)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]