From 113adc173f93089d6c2692a1bbe8a98d66c65c90 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 10 Apr 2023 16:20:04 +0200 Subject: libtracker-sparql: Pass TrackerNotifier explicitly when flushing events Try to decouple the dependency on cache->notifier in code. This is a good start. --- src/libtracker-sparql/direct/tracker-direct.c | 2 +- src/libtracker-sparql/tracker-notifier-private.h | 3 ++- src/libtracker-sparql/tracker-notifier.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libtracker-sparql/direct/tracker-direct.c b/src/libtracker-sparql/direct/tracker-direct.c index c44254bcb..b3172ea32 100644 --- a/src/libtracker-sparql/direct/tracker-direct.c +++ b/src/libtracker-sparql/direct/tracker-direct.c @@ -723,7 +723,7 @@ commit_statement_cb (gpointer user_data) while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &cache)) { g_hash_table_iter_steal (&iter); - _tracker_notifier_event_cache_flush_events (cache); + _tracker_notifier_event_cache_flush_events (notifier, cache); } } diff --git a/src/libtracker-sparql/tracker-notifier-private.h b/src/libtracker-sparql/tracker-notifier-private.h index c9bc73e18..f277cb3f6 100644 --- a/src/libtracker-sparql/tracker-notifier-private.h +++ b/src/libtracker-sparql/tracker-notifier-private.h @@ -37,7 +37,8 @@ _tracker_notifier_event_cache_push_event (TrackerNotifierEventCache *cache, gint64 id, TrackerNotifierEventType event_type); -void _tracker_notifier_event_cache_flush_events (TrackerNotifierEventCache *cache); +void _tracker_notifier_event_cache_flush_events (TrackerNotifier *notifier, + TrackerNotifierEventCache *cache); const gchar * tracker_notifier_event_cache_get_graph (TrackerNotifierEventCache *cache); diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c index 63cf0e61f..0347e0c7d 100644 --- a/src/libtracker-sparql/tracker-notifier.c +++ b/src/libtracker-sparql/tracker-notifier.c @@ -652,9 +652,9 @@ out: } void -_tracker_notifier_event_cache_flush_events (TrackerNotifierEventCache *cache) +_tracker_notifier_event_cache_flush_events (TrackerNotifier *notifier, + TrackerNotifierEventCache *cache) { - TrackerNotifier *notifier = cache->notifier; TrackerNotifierPrivate *priv = tracker_notifier_get_instance_private (notifier); if (g_sequence_is_empty (cache->sequence)) { @@ -697,7 +697,7 @@ graph_updated_cb (GDBusConnection *connection, handle_events (notifier, cache, events); g_variant_iter_free (events); - _tracker_notifier_event_cache_flush_events (cache); + _tracker_notifier_event_cache_flush_events (notifier, cache); } static void -- cgit v1.2.1