From afbd7f9cb66a9619fbb6c675081b81bf0668b9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 19 Mar 2008 14:23:28 +0000 Subject: [PATCH] Check that tracker is actually running before using it (#386512). Patch by * libnautilus-private/nautilus-search-engine-tracker.c: (nautilus_search_engine_tracker_new): Check that tracker is actually running before using it (#386512). Patch by Josselin Mouette. svn path=/trunk/; revision=13955 --- ChangeLog | 7 +++++++ libnautilus-private/nautilus-search-engine-tracker.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 86baf10ea..73eb205c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-19 Sebastian Dröge + + * libnautilus-private/nautilus-search-engine-tracker.c: + (nautilus_search_engine_tracker_new): Check that tracker is + actually running before using it (#386512). + Patch by Josselin Mouette. + 2008-03-19 Sebastian Dröge * src/file-manager/fm-directory-view.c: diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c index c1ec553dd..327a37501 100644 --- a/libnautilus-private/nautilus-search-engine-tracker.c +++ b/libnautilus-private/nautilus-search-engine-tracker.c @@ -258,6 +258,7 @@ nautilus_search_engine_tracker_new (void) { NautilusSearchEngineTracker *engine; TrackerClient *tracker_client; + GError *err = NULL; tracker_client = tracker_connect (FALSE); @@ -265,6 +266,14 @@ nautilus_search_engine_tracker_new (void) return NULL; } + tracker_get_version (tracker_client, &err); + + if (err != NULL) { + g_error_free (err); + tracker_disconnect (tracker_client); + return NULL; + } + engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL); engine->details->client = tracker_client;