diff options
| author | Jürg Billeter <j@bitron.ch> | 2009-09-23 15:18:34 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2009-09-26 12:35:18 +0200 |
| commit | 08e6114dbdf4553b4bcc12a38b0955da153c8efe (patch) | |
| tree | 0372a68101d1029a98b5f37a76d01dff64f644cc | |
| parent | a2a7f3a2a7909824c7a2643d9251c0e74f17b548 (diff) | |
| download | nautilus-08e6114dbdf4553b4bcc12a38b0955da153c8efe.tar.gz | |
Update tracker support for version 0.7
Fixes bug 596082.
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-search-engine-tracker.c | 24 |
2 files changed, 34 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d080c0fcc..0c79483ab 100644 --- a/configure.in +++ b/configure.in @@ -207,12 +207,20 @@ AC_ARG_ENABLE(tracker, [build without tracker support])) msg_tracker=no if test "x$enable_tracker" != "xno"; then - PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [ - AM_CONDITIONAL(HAVE_TRACKER, true) + PKG_CHECK_MODULES(TRACKER, tracker-client-0.7, [ + AM_CONDITIONAL(HAVE_TRACKER, true) AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support]) + AC_DEFINE(HAVE_TRACKER_0_7, 1, [Define to enable tracker support]) ] msg_tracker=yes, - [AM_CONDITIONAL(HAVE_TRACKER, false)]) + [ + PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [ + AM_CONDITIONAL(HAVE_TRACKER, true) + AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support]) + ] + msg_tracker=yes, + [AM_CONDITIONAL(HAVE_TRACKER, false)]) + ]) AC_SUBST(TRACKER_CFLAGS) AC_SUBST(TRACKER_LIBS) fi diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c index 327a37501..3d2b465d6 100644 --- a/libnautilus-private/nautilus-search-engine-tracker.c +++ b/libnautilus-private/nautilus-search-engine-tracker.c @@ -23,10 +23,15 @@ #include <config.h> #include "nautilus-search-engine-tracker.h" -#include <tracker.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-glib-extensions.h> +#ifdef HAVE_TRACKER_0_7 +#include <libtracker-client/tracker.h> +#else +#include <tracker.h> +#endif + struct NautilusSearchEngineTrackerDetails { @@ -91,7 +96,11 @@ search_callback (char **results, GError *error, gpointer user_data) char *uri; +#ifdef HAVE_TRACKER_0_7 + uri = *results_p; +#else uri = g_filename_to_uri ((char *)*results_p, NULL, NULL); +#endif if (uri) { hit_uris = g_list_prepend (hit_uris, (char *)uri); } @@ -100,7 +109,11 @@ search_callback (char **results, GError *error, gpointer user_data) nautilus_search_engine_hits_added (NAUTILUS_SEARCH_ENGINE (tracker), hit_uris); nautilus_search_engine_finished (NAUTILUS_SEARCH_ENGINE (tracker)); g_strfreev (results); +#ifdef HAVE_TRACKER_0_7 + g_list_free (hit_uris); +#else eel_g_list_free_deep (hit_uris); +#endif } @@ -131,8 +144,12 @@ nautilus_search_engine_tracker_start (NautilusSearchEngine *engine) location_uri = nautilus_query_get_location (tracker->details->query); if (location_uri) { +#ifdef HAVE_TRACKER_0_7 + location = location_uri; +#else location = g_filename_from_uri (location_uri, NULL, NULL); g_free (location_uri); +#endif } else { location = NULL; } @@ -258,6 +275,10 @@ nautilus_search_engine_tracker_new (void) { NautilusSearchEngineTracker *engine; TrackerClient *tracker_client; + +#ifdef HAVE_TRACKER_0_7 + tracker_client = tracker_connect (FALSE, -1); +#else GError *err = NULL; tracker_client = tracker_connect (FALSE); @@ -273,6 +294,7 @@ nautilus_search_engine_tracker_new (void) tracker_disconnect (tracker_client); return NULL; } +#endif engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL); |