Index: configure.in
===================================================================
--- configure.in	(revision 5060)
+++ configure.in	(working copy)
@@ -234,11 +234,11 @@
 dnl Also check if we're going to be using GTK+ only
 if test x$ENABLE_GTK = "xno" ; then
 # FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM gio-2.0)
 	HAVE_GNOME=yes
 else
 # FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM gio-2.0)
 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
 	HAVE_GNOME=no
Index: src/plugins/tracker/totem-tracker-widget.c
===================================================================
--- src/plugins/tracker/totem-tracker-widget.c	(revision 5060)
+++ src/plugins/tracker/totem-tracker-widget.c	(working copy)
@@ -31,7 +31,7 @@
 #include <tracker.h>
 #include <tracker-client.h>
 #include <glib/gi18n-lib.h>
-#include <libgnomevfs/gnome-vfs.h>
+#include <gio/gio.h>
 #include <libgnomeui/gnome-thumbnail.h>
 
 #include "totem-tracker-widget.h"
@@ -138,17 +138,18 @@
 populate_result (TotemTrackerWidget *widget, char *result)
 {
 	GtkTreeIter iter;
-	GnomeVFSFileInfo *info;
-	GnomeVFSResult vfs_result;
+	GFile *file;
+	GFileInfo *info;
+	GError *error = NULL;
 	GdkPixbuf *thumbnail = NULL;
 	char *thumbnail_path, *file_uri;
 
-	info = gnome_vfs_file_info_new ();
-	vfs_result = gnome_vfs_get_file_info (result, info, GNOME_VFS_FILE_INFO_NAME_ONLY);
+	file = g_file_new_for_path (result);
+	info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, G_FILE_QUERY_INFO_NONE, NULL, &error);
 
-	if (vfs_result == GNOME_VFS_OK) {
+	if (error == NULL) {
 		gtk_list_store_append (GTK_LIST_STORE (widget->priv->result_store), &iter);  /* Acquire an iterator */
-		file_uri = gnome_vfs_get_uri_from_local_path (result);
+		file_uri = g_file_get_uri (file);
 		thumbnail_path = gnome_thumbnail_path_for_uri (file_uri, GNOME_THUMBNAIL_SIZE_NORMAL);
 
 		if (thumbnail_path != NULL)
@@ -157,19 +158,21 @@
 		gtk_list_store_set (GTK_LIST_STORE (widget->priv->result_store), &iter,
 				    IMAGE_COLUMN, thumbnail,
 				    FILE_COLUMN, file_uri,
-				    NAME_COLUMN, info->name,
+				    NAME_COLUMN, g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME),
 				    -1);
 
 		g_free (thumbnail_path);
 		g_free (file_uri);
 	} else {
 		/* Display an error */
-		char *message = g_strdup_printf (_("Could not get metadata for file %s."), result);
+		char *message = g_strdup_printf (_("Could not get metadata for file %s: %s"), result, error->message);
 		totem_interface_error_blocking	(_("File Error"), message, NULL);
 		g_free (message);
+		g_error_free (error);
 	}
 
-	g_free (info);
+	g_object_unref (file);
+	g_object_unref (info);
 }
 
 static int
