rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2.13.2

Browse Source
This commit is contained in:
Matthias Clasen 2005-12-02 14:06:40 +00:00
parent ce36088ca9
commit 4c7d8fddc3
4 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -9,3 +9,4 @@ nautilus-2.11.90.tar.bz2
nautilus-2.11.91.tar.bz2
nautilus-2.12.0.tar.bz2
nautilus-2.12.1.tar.bz2
nautilus-2.13.2.tar.bz2

53
nautilus-2.13-format.patch Normal file
View File

@ -0,0 +1,53 @@
--- 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;
GList *selection, *l;
GnomeVFSDrive *drive;
+ char *device_path;
+ char *cmdline;
FMDirectoryView *view;
view = FM_DIRECTORY_VIEW (data);
@@ -5874,9 +5876,16 @@
if (nautilus_file_has_drive (file)) {
drive = nautilus_file_get_drive (file);
+ device_path = gnome_vfs_drive_get_device_path (drive);
if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY) {
- g_spawn_command_line_async ("gfloppy", NULL);
+ cmdline = g_strconcat ("gfloppy ", device_path, NULL);
}
+ else {
+ cmdline = g_strconcat ("userformat ", device_path, NULL);
+ }
+ g_spawn_command_line_async (cmdline, NULL);
+ g_free (cmdline);
+ g_free (device_path);
}
}
nautilus_file_list_free (selection);
@@ -6607,16 +6616,18 @@
} 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));
+ if ((gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
+ g_find_program_in_path ("gfloppy")) ||
+ g_find_program_in_path ("userformat")) {
+ *show_format = TRUE;
+ }
+
if (gnome_vfs_drive_is_mounted (drive)) {
*show_unmount = TRUE;
+ *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 &&

14
nautilus.spec
View File

@ -17,8 +17,8 @@
Name: nautilus
Summary: Nautilus is a file manager for GNOME.
Version: 2.12.1
Release: 6
Version: 2.13.2
Release: 1
License: GPL
Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@ -78,10 +78,7 @@ Obsoletes: nautilus-media
# Some changes to default config
Patch1: nautilus-2.5.7-rhconfig.patch
# Partially upstream in 2.13
Patch2: nautilus-2.12.1-format.patch
# Upstream in 2.13
Patch3: nautilus-2.12.1-stretch.patch
Patch2: nautilus-2.13-format.patch
%description
Nautilus integrates access to files, applications, media,
@ -95,7 +92,6 @@ GNOME desktop project.
%patch1 -p1 -b .rhconfig
%patch2 -p1 -b .format
%patch3 -p1 -b .stretch
%build
@ -172,6 +168,10 @@ scrollkeeper-update
%{_includedir}/nautilus
%changelog
* Fri Dec 2 2005 Matthias Clasen <mclasen@redhat.com> 2.13.2-1
- Update to 2.13.2
- Update patches
* Tue Nov 1 2005 Alexander Larsson <alexl@redhat.com> - 2.12.1-6
- Switch XFree86-devel buildrequirement to libX11-devel

2
sources
View File

@ -1 +1 @@
61878b1c3f9bee37cd568e17b31d66b1 nautilus-2.12.1.tar.bz2
0cc0df8b01b095103f63c8fe3580d7ca nautilus-2.13.2.tar.bz2