This commit is contained in:
Alexander Larsson 2005-12-13 17:11:12 +00:00
parent d80f506cea
commit 448e56fa7c

View File

@ -1,15 +1,20 @@
--- nautilus-2.13.2/src/file-manager/fm-directory-view.c.format 2005-12-02 08:41:23.000000000 -0500
+++ nautilus-2.13.2/src/file-manager/fm-directory-view.c 2005-12-02 08:46:44.000000000 -0500
@@ -5864,6 +5864,8 @@
NautilusFile *file;
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.727
diff -u -p -r1.727 fm-directory-view.c
--- src/file-manager/fm-directory-view.c 12 Dec 2005 16:59:11 -0000 1.727
+++ src/file-manager/fm-directory-view.c 13 Dec 2005 17:10:16 -0000
@@ -6192,6 +6192,8 @@ action_format_volume_callback (GtkAction
GList *selection, *l;
GnomeVFSDrive *drive;
FMDirectoryView *view;
+ char *device_path;
+ char *cmdline;
FMDirectoryView *view;
view = FM_DIRECTORY_VIEW (data);
@@ -5874,9 +5876,16 @@
@@ -6201,9 +6203,16 @@ action_format_volume_callback (GtkAction
if (nautilus_file_has_drive (file)) {
drive = nautilus_file_get_drive (file);
@ -27,7 +32,7 @@
}
}
nautilus_file_list_free (selection);
@@ -6607,16 +6616,18 @@
@@ -6944,15 +6953,17 @@ file_should_show_foreach (NautilusFile *
} else if (nautilus_file_has_drive (file)) {
drive = nautilus_file_get_drive (file);
*show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));
@ -42,12 +47,11 @@
+ *show_format = FALSE;
} else {
*show_mount = TRUE;
}
- }
-
- if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
- g_find_program_in_path ("gfloppy")) {
- *show_format = TRUE;
- }
}
} else if (nautilus_file_is_nautilus_link (file)) {
uri = nautilus_file_get_activation_uri (file);
if (uri != NULL &&