diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 5455b0f0e6257b40dfa04c6694bdcfcc6989bd73..96f32b2abd372982ce0427ffbf9f833230342e29 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,12 @@
+2000-01-18  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* src/file-manager/dfos-xfer.c (xfer_info_destroy): Removed `#if
+	0'ed out function.
+
+	* src/ntl-uri-map.c (nautilus_navinfo_new): Use
+	`gnome_vfs_file_info_unref()' instead of
+	`gnome_vfs_file_info_destroy()'.
+
 2000-01-18  Andy Hertzfeld <andy@eazel.com>
 
         * libnautilus/gnome-icon-container-private.h:
diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c
index fae9dd3c7450d291e9a9621e89a275e95cf9efbc..dd77a042c52bb2edb5a9e1a74d532f9542b4a48e 100644
--- a/libnautilus-extensions/nautilus-file-operations.c
+++ b/libnautilus-extensions/nautilus-file-operations.c
@@ -62,14 +62,6 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
 	return new;
 }
 
-#if 0
-static void
-xfer_info_destroy (XferInfo *info)
-{
-	g_free (info);
-}
-#endif
-
 static void
 xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
 			      gint button_number,
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index fae9dd3c7450d291e9a9621e89a275e95cf9efbc..dd77a042c52bb2edb5a9e1a74d532f9542b4a48e 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -62,14 +62,6 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
 	return new;
 }
 
-#if 0
-static void
-xfer_info_destroy (XferInfo *info)
-{
-	g_free (info);
-}
-#endif
-
 static void
 xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
 			      gint button_number,
diff --git a/src/file-manager/dfos-xfer.c b/src/file-manager/dfos-xfer.c
index fae9dd3c7450d291e9a9621e89a275e95cf9efbc..dd77a042c52bb2edb5a9e1a74d532f9542b4a48e 100644
--- a/src/file-manager/dfos-xfer.c
+++ b/src/file-manager/dfos-xfer.c
@@ -62,14 +62,6 @@ xfer_info_new (GnomeVFSAsyncHandle *handle,
 	return new;
 }
 
-#if 0
-static void
-xfer_info_destroy (XferInfo *info)
-{
-	g_free (info);
-}
-#endif
-
 static void
 xfer_dialog_clicked_callback (DFOSXferProgressDialog *dialog,
 			      gint button_number,
diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c
index 605ce73c6f056042ac701bfffcee887454ed8198..fbfeb9eedab745cff0db1475b00f270ae78545e9 100644
--- a/src/nautilus-applicable-views.c
+++ b/src/nautilus-applicable-views.c
@@ -266,13 +266,13 @@ nautilus_navinfo_new(Nautilus_NavigationRequestInfo *nri,
                                     meta_keys);
       if(res != GNOME_VFS_OK)
         {
-          gnome_vfs_file_info_destroy(vfs_fileinfo);
+          gnome_vfs_file_info_unref(vfs_fileinfo);
           nautilus_navinfo_free(navinfo); navinfo = NULL;
           goto out;
         }
 
       navinfo->navinfo.content_type = g_strdup(gnome_vfs_file_info_get_mime_type(vfs_fileinfo));
-      gnome_vfs_file_info_destroy(vfs_fileinfo);
+      gnome_vfs_file_info_unref(vfs_fileinfo);
     }
 
 
diff --git a/src/ntl-uri-map.c b/src/ntl-uri-map.c
index 605ce73c6f056042ac701bfffcee887454ed8198..fbfeb9eedab745cff0db1475b00f270ae78545e9 100644
--- a/src/ntl-uri-map.c
+++ b/src/ntl-uri-map.c
@@ -266,13 +266,13 @@ nautilus_navinfo_new(Nautilus_NavigationRequestInfo *nri,
                                     meta_keys);
       if(res != GNOME_VFS_OK)
         {
-          gnome_vfs_file_info_destroy(vfs_fileinfo);
+          gnome_vfs_file_info_unref(vfs_fileinfo);
           nautilus_navinfo_free(navinfo); navinfo = NULL;
           goto out;
         }
 
       navinfo->navinfo.content_type = g_strdup(gnome_vfs_file_info_get_mime_type(vfs_fileinfo));
-      gnome_vfs_file_info_destroy(vfs_fileinfo);
+      gnome_vfs_file_info_unref(vfs_fileinfo);
     }