libbonoboui r2639 - in trunk: . bonobo

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Aug  4 14:09:37 2008
New Revision: 2639
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2639&view=rev

Log:
2008-08-04  Cosimo Cecchi  <cosimoc gnome org>

	reviewed by: Michael Meeks <michael meeks novell com>

	* bonobo/bonobo-file-selector-util.c: (run_file_selector):
	* configure.in:
	Remove gnome-vfs dependency (#544831).


Modified:
   trunk/ChangeLog
   trunk/bonobo/bonobo-file-selector-util.c
   trunk/configure.in

Modified: trunk/bonobo/bonobo-file-selector-util.c
==============================================================================
--- trunk/bonobo/bonobo-file-selector-util.c	(original)
+++ trunk/bonobo/bonobo-file-selector-util.c	Mon Aug  4 14:09:37 2008
@@ -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")))
@@ -303,7 +301,7 @@
 #ifndef G_OS_WIN32
 		if (enable_vfs && !using_bonobo_filesel &&
 				(mode != FILESEL_OPEN_MULTI)) {
-	 		retval = gnome_vfs_get_uri_from_local_path (data);
+	 		retval = g_filename_to_uri (data, NULL, NULL);
  			g_free (data);
 
 		} else if (enable_vfs && !using_bonobo_filesel &&
@@ -313,7 +311,7 @@
 
 			for (i = 0; files[i]; ++i) {
 				gchar *tmp = files[i];
-				files[i] = gnome_vfs_get_uri_from_local_path (tmp);
+				files[i] = g_filename_to_uri (tmp, NULL, NULL);
 				g_free (tmp);
 			}
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug  4 14:09:37 2008
@@ -111,9 +111,7 @@
 		  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"
+		  gobject-2.0 >= 2.6.0"
 PKG_CHECK_MODULES(BONOBOUI, $BONOBOUI_MODULES)
 AC_SUBST(BONOBOUI_CFLAGS)
 AC_SUBST(BONOBOUI_LIBS)