Index: configure.in
===================================================================
--- configure.in	(revision 2637)
+++ configure.in	(working copy)
@@ -111,9 +111,8 @@ BONOBOUI_MODULES="libgnomecanvas-2.0 >= 
 		  libxml-2.0 >= 2.4.20 \
 		  gconf-2.0 >= 1.1.9 \
 		  gtk+-2.0 >= 2.6.0 \
-		  gobject-2.0 >= 2.6.0 \
-		  gnome-vfs-2.0 >= 2.8.0 \
-		  gnome-vfs-module-2.0 > 2.8.0"
+		  glib-2.0 >= 2.16.0 \
+		  gobject-2.0 >= 2.6.0"
 PKG_CHECK_MODULES(BONOBOUI, $BONOBOUI_MODULES)
 AC_SUBST(BONOBOUI_CFLAGS)
 AC_SUBST(BONOBOUI_LIBS)
Index: bonobo/bonobo-file-selector-util.c
===================================================================
--- bonobo/bonobo-file-selector-util.c	(revision 2637)
+++ bonobo/bonobo-file-selector-util.c	(working copy)
@@ -26,10 +26,8 @@
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkstock.h>
-#ifndef G_OS_WIN32
-#include <libgnomevfs/gnome-vfs.h>
-#endif
 
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #define GET_MODE(w) (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (w), "GnomeFileSelectorMode")))
@@ -252,6 +250,18 @@ create_gtk_selector (FileselMode mode,
 	return GTK_WINDOW (chooser);
 }
 
+static char *
+uri_from_local_path (const char *path)
+{
+	char *escaped, *retval;
+
+	escaped = g_uri_escape_string (path, "/&=", TRUE);
+	retval = g_strconcat ("file://", escaped, NULL);
+	g_free (escaped);
+
+	return retval;
+}
+
 static gpointer
 run_file_selector (GtkWindow  *parent,
 		   gboolean    enable_vfs,
@@ -303,7 +313,7 @@ run_file_selector (GtkWindow  *parent,
 #ifndef G_OS_WIN32
 		if (enable_vfs && !using_bonobo_filesel &&
 				(mode != FILESEL_OPEN_MULTI)) {
-	 		retval = gnome_vfs_get_uri_from_local_path (data);
+	 		retval = uri_from_local_path (data);
  			g_free (data);
 
 		} else if (enable_vfs && !using_bonobo_filesel &&
@@ -313,7 +323,7 @@ run_file_selector (GtkWindow  *parent,
 
 			for (i = 0; files[i]; ++i) {
 				gchar *tmp = files[i];
-				files[i] = gnome_vfs_get_uri_from_local_path (tmp);
+				files[i] = uri_from_local_path (tmp);
 				g_free (tmp);
 			}
 
