Completely untested (trivial) gio port..... Bonobo and friends still
seems to pull in gnome-vfs and eiciel still links to it even though it's
not needed. :(
--
Regards,
Andreas Henriksson
--- eiciel-0.9.6.orig/src/eiciel_nautilus_page.cpp
+++ eiciel-0.9.6/src/eiciel_nautilus_page.cpp
@@ -23,7 +23,7 @@
#include <gtk/gtklabel.h>
#include <libnautilus-extension/nautilus-property-page.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
-#include <libgnomevfs/gnome-vfs.h>
+#include <gio/gio.h>
#include <gettext.h>
#include "eiciel_main_controler.hpp"
@@ -98,23 +98,18 @@
return NULL;
}
- GnomeVFSURI* guri = gnome_vfs_uri_new(uri);
+ GFile *guri = g_file_new_for_uri (uri);
- if (guri == NULL)
- {
- return NULL;
- }
// i comprovem que és local
- const gchar* scheme = gnome_vfs_uri_get_scheme(guri);
- if (strcmp(scheme, "file") != 0)
+ if (!g_file_has_uri_scheme (guri, "file"))
{
- g_free(guri);
+ g_object_unref (guri);
return NULL;
}
// Si és local obtenim el path del fitxer
- local_file = gnome_vfs_get_local_path_from_uri(uri);
- g_free(guri);
+ local_file = g_file_get_path (guri);
+ g_object_unref (guri);
// Alguns fitxers son locals pero no corresponen a un fitxer real
if (local_file == NULL)
--- eiciel-0.9.6.orig/src/eiciel_container.hpp
+++ eiciel-0.9.6/src/eiciel_container.hpp
@@ -18,7 +18,6 @@
*/
#include <config.hpp>
#include <gtkmm.h>
-#include <libgnomevfs/gnome-vfs.h>
#include <libgnome/libgnome.h>
#include <gettext.h>
--- eiciel-0.9.6.orig/configure.ac 2008-04-13 18:51:18.000000000 +0200
+++ eiciel-0.9.6/configure.ac 2008-04-12 19:18:53.000000000 +0200
@@ -38,7 +38,7 @@
AC_PROG_LIBTOOL
dnl Comprovem si hi ha la llibreria gtkmm-2.0
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 libgnomeui-2.0 >= 2.10.0 gnome-vfs-2.0 >= 2.10.0 libnautilus-extension >= 2.10.0)
+PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 libgnomeui-2.0 >= 2.10.0 libnautilus-extension >= 2.10.0)
AC_MSG_CHECKING([for nautilus extensions directory])
