From 849742553573b4210002aa47f7ba19d8045438be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= Date: Thu, 9 Feb 2023 19:25:04 +0100 Subject: [PATCH 1/2] searchengine: Add missing sanity check (cherry picked from commit 41490f96240eb04d85cbe5e1f264ab09ec00b9e0) --- gtk/gtksearchenginetracker3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk/gtksearchenginetracker3.c b/gtk/gtksearchenginetracker3.c index bbc2a7752d..2bdb85ec5d 100644 --- a/gtk/gtksearchenginetracker3.c +++ b/gtk/gtksearchenginetracker3.c @@ -100,8 +100,11 @@ finalize (GObject *object) g_clear_object (&engine->search_query); g_clear_object (&engine->search_location_query); g_clear_object (&engine->file_check_query); - tracker_sparql_connection_close (engine->sparql_conn); - g_clear_object (&engine->sparql_conn); + if (engine->sparql_conn != NULL) + { + tracker_sparql_connection_close (engine->sparql_conn); + g_clear_object (&engine->sparql_conn); + } G_OBJECT_CLASS (gtk_search_engine_tracker3_parent_class)->finalize (object); } From 857f734d8373ab7894081c6e697d216aea322b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= Date: Thu, 9 Feb 2023 19:26:47 +0100 Subject: [PATCH 2/2] searchengine: Emit a simple warning when tracker init failed Failure is allowed by nature of GInitable, and this avoids unnecessary crashing of programs running with G_DEBUG=fatal-criticals. (cherry picked from commit 6215b38e645f5047d52e625562efccc1e4f85867) --- gtk/gtksearchenginetracker3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtksearchenginetracker3.c b/gtk/gtksearchenginetracker3.c index 2bdb85ec5d..3f054110b5 100644 --- a/gtk/gtksearchenginetracker3.c +++ b/gtk/gtksearchenginetracker3.c @@ -394,8 +394,8 @@ gtk_search_engine_tracker3_new (void) NULL, &error, NULL); if (!engine) { - g_critical ("Could not init tracker3 search engine: %s", - error->message); + g_warning ("Could not init tracker3 search engine: %s", + error->message); g_error_free (error); }