| 0 | |
--- eiciel-0.9.6.orig/src/eiciel_nautilus_page.cpp
|
| 1 | |
+++ eiciel-0.9.6/src/eiciel_nautilus_page.cpp
|
| 2 | |
@@ -23,7 +23,7 @@
|
| 3 | |
#include <gtk/gtklabel.h>
|
| 4 | |
#include <libnautilus-extension/nautilus-property-page.h>
|
| 5 | |
#include <libnautilus-extension/nautilus-property-page-provider.h>
|
| 6 | |
-#include <libgnomevfs/gnome-vfs.h>
|
| 7 | |
+#include <gio/gio.h>
|
| 8 | |
#include <gettext.h>
|
| 9 | |
|
| 10 | |
#include "eiciel_main_controler.hpp"
|
| 11 | |
@@ -98,23 +98,18 @@
|
| 12 | |
return NULL;
|
| 13 | |
}
|
| 14 | |
|
| 15 | |
- GnomeVFSURI* guri = gnome_vfs_uri_new(uri);
|
| 16 | |
+ GFile *guri = g_file_new_for_uri (uri);
|
| 17 | |
|
| 18 | |
- if (guri == NULL)
|
| 19 | |
- {
|
| 20 | |
- return NULL;
|
| 21 | |
- }
|
| 22 | |
// i comprovem que és local
|
| 23 | |
- const gchar* scheme = gnome_vfs_uri_get_scheme(guri);
|
| 24 | |
- if (strcmp(scheme, "file") != 0)
|
| 25 | |
+ if (!g_file_has_uri_scheme (guri, "file"))
|
| 26 | |
{
|
| 27 | |
- g_free(guri);
|
| 28 | |
+ g_object_unref (guri);
|
| 29 | |
return NULL;
|
| 30 | |
}
|
| 31 | |
|
| 32 | |
// Si és local obtenim el path del fitxer
|
| 33 | |
- local_file = gnome_vfs_get_local_path_from_uri(uri);
|
| 34 | |
- g_free(guri);
|
| 35 | |
+ local_file = g_file_get_path (guri);
|
| 36 | |
+ g_object_unref (guri);
|
| 37 | |
|
| 38 | |
// Alguns fitxers son locals pero no corresponen a un fitxer real
|
| 39 | |
if (local_file == NULL)
|
| 40 | |
--- eiciel-0.9.6.orig/src/eiciel_container.hpp
|
| 41 | |
+++ eiciel-0.9.6/src/eiciel_container.hpp
|
| 42 | |
@@ -18,7 +18,6 @@
|
| 43 | |
*/
|
| 44 | |
#include <config.hpp>
|
| 45 | |
#include <gtkmm.h>
|
| 46 | |
-#include <libgnomevfs/gnome-vfs.h>
|
| 47 | |
#include <libgnome/libgnome.h>
|
| 48 | |
#include <gettext.h>
|
| 49 | |
|
| 50 | |
--- eiciel-0.9.6.orig/configure.ac 2008-04-13 18:51:18.000000000 +0200
|
| 51 | |
+++ eiciel-0.9.6/configure.ac 2008-04-12 19:18:53.000000000 +0200
|
| 52 | |
@@ -38,7 +38,7 @@
|
| 53 | |
AC_PROG_LIBTOOL
|
| 54 | |
|
| 55 | |
dnl Comprovem si hi ha la llibreria gtkmm-2.0
|
| 56 | |
-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)
|
| 57 | |
+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)
|
| 58 | |
|
| 59 | |
AC_MSG_CHECKING([for nautilus extensions directory])
|
| 60 | |
|