Merge branch 'wip/carlosg/ensure-notifier-order' into tracker-3.2tracker-3.2

Backport of https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/482

1 files changed, 3 insertions, 5 deletions

diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c
index cb7ce9022..01081a75b 100644
--- a/src/libtracker-sparql/tracker-notifier.c
+++ b/src/libtracker-sparql/tracker-notifier.c
@@ -400,13 +400,14 @@ create_extra_info_query (TrackerNotifier           *notifier,
 
 	g_string_append (sparql,
 	                 "  } ."
-	                 "  BIND (tracker:uri(xsd:integer(?id)) AS ?uri)"
+	                 "  BIND (tracker:uri(xsd:integer(?id)) AS ?uri) ."
+	                 "  FILTER (?id > 0) ."
 	                 "} ");
 
 	if (service)
 		g_string_append (sparql, "} ");
 
-	g_string_append (sparql, "ORDER BY ?id");
+	g_string_append (sparql, "ORDER BY xsd:integer(?id)");
 
 	g_free (service);
 
@@ -473,9 +474,6 @@ handle_cursor (GTask        *task,
 	 */
 	while (tracker_sparql_cursor_next (cursor, NULL, NULL)) {
 		id = tracker_sparql_cursor_get_integer (cursor, 0);
-		if (id == 0)
-			continue;
-
 		event = g_sequence_get (iter);
 		iter = g_sequence_iter_next (iter);