Merge gio-branch

svn path=/trunk/; revision=13464

2 files changed, 1 insertions, 66 deletions

diff --git a/libnautilus-extension/nautilus-file-info.c b/libnautilus-extension/nautilus-file-info.c
index 08cae486b..762a0d5b8 100644
--- a/libnautilus-extension/nautilus-file-info.c
+++ b/libnautilus-extension/nautilus-file-info.c
@@ -165,21 +165,12 @@ nautilus_file_info_is_directory (NautilusFileInfo *file)
 	return NAUTILUS_FILE_INFO_GET_IFACE (file)->is_directory (file);
 }
 
-GnomeVFSFileInfo *
-nautilus_file_info_get_vfs_file_info (NautilusFileInfo *file)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file), NULL);
-	g_return_val_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->get_vfs_file_info != NULL, NULL);
-
-	return NAUTILUS_FILE_INFO_GET_IFACE (file)->get_vfs_file_info (file);
-}
-
 void
 nautilus_file_info_add_emblem (NautilusFileInfo *file,
 			       const char *emblem_name)
 {
 	g_return_if_fail (NAUTILUS_IS_FILE_INFO (file));
-	g_return_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->get_vfs_file_info != NULL);
+	g_return_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->add_emblem != NULL);
 
 	NAUTILUS_FILE_INFO_GET_IFACE (file)->add_emblem (file, emblem_name);
 }
@@ -218,39 +209,3 @@ nautilus_file_info_invalidate_extension_info (NautilusFileInfo *file)
 	
 	NAUTILUS_FILE_INFO_GET_IFACE (file)->invalidate_extension_info (file);
 }
-
-gboolean          
-nautilus_file_info_has_volume         (NautilusFileInfo *file) 
-{
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file), FALSE);
-	g_return_val_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->has_volume != NULL, FALSE);
-
-	return NAUTILUS_FILE_INFO_GET_IFACE (file)->has_volume (file);
-}
-
-gboolean          
-nautilus_file_info_has_drive         (NautilusFileInfo *file)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file), FALSE);
-	g_return_val_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->has_drive != NULL, FALSE);
-
-	return NAUTILUS_FILE_INFO_GET_IFACE (file)->has_drive (file);
-}
-
-GnomeVFSVolume*   
-nautilus_file_info_get_volume         (NautilusFileInfo *file)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file),NULL);
-	g_return_val_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->get_volume != NULL,NULL);
-	
-	return NAUTILUS_FILE_INFO_GET_IFACE (file)->get_volume (file);
-}
-
-GnomeVFSDrive*   
-nautilus_file_info_get_drive         (NautilusFileInfo *file)
-{
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file),NULL);
-	g_return_val_if_fail (NAUTILUS_FILE_INFO_GET_IFACE (file)->get_drive != NULL,NULL);
-	
-	return NAUTILUS_FILE_INFO_GET_IFACE (file)->get_drive (file);
-}
diff --git a/libnautilus-extension/nautilus-file-info.h b/libnautilus-extension/nautilus-file-info.h
index bb1a8f682..48fa1ab8f 100644
--- a/libnautilus-extension/nautilus-file-info.h
+++ b/libnautilus-extension/nautilus-file-info.h
@@ -27,8 +27,6 @@
 #define NAUTILUS_FILE_INFO_H
 
 #include <glib-object.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-volume.h>
 
 G_BEGIN_DECLS
 
@@ -65,8 +63,6 @@ struct _NautilusFileInfoIface
 						   const char       *mime_Type);
 	gboolean          (*is_directory)         (NautilusFileInfo *file);
 	
-	GnomeVFSFileInfo *(*get_vfs_file_info)    (NautilusFileInfo *file);
-	
 	void              (*add_emblem)           (NautilusFileInfo *file,
 						   const char       *emblem_name);
 	char *            (*get_string_attribute) (NautilusFileInfo *file,
@@ -76,11 +72,6 @@ struct _NautilusFileInfoIface
 						   const char       *value);
 	void              (*invalidate_extension_info) (NautilusFileInfo *file);
 	
-	gboolean              (*has_volume)       (NautilusFileInfo *file);
-	gboolean              (*has_drive)        (NautilusFileInfo *file);
-	GnomeVFSVolume*       (*get_volume)       (NautilusFileInfo *file);
-	GnomeVFSDrive*        (*get_drive)        (NautilusFileInfo *file);
-
 	char *            (*get_activation_uri)   (NautilusFileInfo *file);
 };
 
@@ -105,12 +96,6 @@ gboolean          nautilus_file_info_is_mime_type         (NautilusFileInfo *fil
 gboolean          nautilus_file_info_is_directory         (NautilusFileInfo *file);
 
 
-
-/* Other File Info */
-GnomeVFSFileInfo *nautilus_file_info_get_vfs_file_info    (NautilusFileInfo *file);
-
-
-
 /* Modifying the NautilusFileInfo */
 void              nautilus_file_info_add_emblem           (NautilusFileInfo *file,
 							   const char       *emblem_name);
@@ -123,11 +108,6 @@ void              nautilus_file_info_add_string_attribute (NautilusFileInfo *fil
 /* Invalidating file info */
 void              nautilus_file_info_invalidate_extension_info (NautilusFileInfo *file);
 
-/* Volumes and Drives */
-gboolean          nautilus_file_info_has_volume           (NautilusFileInfo *file);
-gboolean          nautilus_file_info_has_drive            (NautilusFileInfo *file);
-GnomeVFSVolume*   nautilus_file_info_get_volume           (NautilusFileInfo *file);
-GnomeVFSDrive*    nautilus_file_info_get_drive            (NautilusFileInfo *file);
 
 G_END_DECLS