Attachment #56210 for bug #127509

View | Details | Raw Unified | Return to bug 127509
Collapse All | Expand All




{
	GnomeVFSVolume *volume;
	GnomeVFSDrive *drive;
	char *uri, *fstype;

	*show_mount = FALSE;
	*show_unmount = FALSE;

	*show_connect = FALSE;

	if (nautilus_file_has_volume (file)) {
		GnomeVFSVolumeType vol_type;

		volume = nautilus_file_get_volume (file);
		vol_type = gnome_vfs_volume_get_volume_type (volume);

		if (vol_type == GNOME_VFS_VOLUME_TYPE_MOUNTPOINT) {
			fstype = gnome_vfs_volume_get_filesystem_type (volume);
			if (fstype && strcmp (fstype, "subfs") != 0) {
				if (!(*show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume))))
					*show_unmount = TRUE;
			}
			g_free (fstype);
		} else {
			*show_unmount = TRUE;
			*show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
		}
	} 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));

Return to bug 127509

Lines 6461-6467 file_should_show_foreach (NautilusFile * Link Here

(-)nautilus-2.12.1/src/file-manager/fm-directory-view.c~ (-3 / +15 lines)
6461	{	6477	{
6462	GnomeVFSVolume *volume;	6478	GnomeVFSVolume *volume;
6463	GnomeVFSDrive *drive;	6479	GnomeVFSDrive *drive;
6464	char *uri;	6480	char uri, fstype;
6465		6481
6466	*show_mount = FALSE;	6482	*show_mount = FALSE;
6467	*show_unmount = FALSE;	6483	*show_unmount = FALSE;
Lines 6469-6478 file_should_show_foreach (NautilusFile * Link Here
6469	*show_connect = FALSE;	6485	*show_connect = FALSE;
6470		6486
6471	if (nautilus_file_has_volume (file)) {	6487	if (nautilus_file_has_volume (file)) {
6472	*show_unmount = TRUE;	6488	GnomeVFSVolumeType vol_type;
6473		6489
6474	volume = nautilus_file_get_volume (file);	6490	volume = nautilus_file_get_volume (file);
6475	*show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));	6491	vol_type = gnome_vfs_volume_get_volume_type (volume);
		6492
		6493	if (vol_type == GNOME_VFS_VOLUME_TYPE_MOUNTPOINT) {
		6494	fstype = gnome_vfs_volume_get_filesystem_type (volume);
		6495	if (fstype && strcmp (fstype, "subfs") != 0) {
		6496	if (!(*show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume))))
		6497	*show_unmount = TRUE;
		6498	}
		6499	g_free (fstype);
		6500	} else {
		6501	*show_unmount = TRUE;
		6502	*show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
		6503	}
6476	} else if (nautilus_file_has_drive (file)) {	6504	} else if (nautilus_file_has_drive (file)) {
6477	drive = nautilus_file_get_drive (file);	6505	drive = nautilus_file_get_drive (file);
6478	*show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));	6506	*show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));