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

Improve the last patch

Browse Source
This commit is contained in:
Matthias Clasen 2005-10-21 14:46:54 +00:00
parent 9a4158ddbd
commit 6bdfd2f175
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nautilus-2.12.1-format.patch
View File

@ -1,5 +1,5 @@
--- nautilus-2.12.1/src/file-manager/fm-actions.h.format 2005-07-01 06:22:19.000000000 -0400 --- nautilus-2.12.1/src/file-manager/fm-actions.h.format 2005-07-01 06:22:19.000000000 -0400
+++ nautilus-2.12.1/src/file-manager/fm-actions.h 2005-10-21 09:44:06.000000000 -0400 +++ nautilus-2.12.1/src/file-manager/fm-actions.h 2005-10-21 10:35:58.000000000 -0400
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
#define FM_ACTION_MOUNT_VOLUME "Mount Volume" #define FM_ACTION_MOUNT_VOLUME "Mount Volume"
#define FM_ACTION_UNMOUNT_VOLUME "Unmount Volume" #define FM_ACTION_UNMOUNT_VOLUME "Unmount Volume"
@ -9,7 +9,7 @@
#define FM_ACTION_NEW_DOCUMENTS "New Documents" #define FM_ACTION_NEW_DOCUMENTS "New Documents"
#define FM_ACTION_NEW_EMPTY_FILE "New Empty File" #define FM_ACTION_NEW_EMPTY_FILE "New Empty File"
--- nautilus-2.12.1/src/file-manager/fm-directory-view.c.format 2005-09-27 04:31:43.000000000 -0400 --- nautilus-2.12.1/src/file-manager/fm-directory-view.c.format 2005-09-27 04:31:43.000000000 -0400
+++ nautilus-2.12.1/src/file-manager/fm-directory-view.c 2005-10-21 09:53:53.000000000 -0400 +++ nautilus-2.12.1/src/file-manager/fm-directory-view.c 2005-10-21 10:38:28.000000000 -0400
@@ -377,6 +377,8 @@ @@ -377,6 +377,8 @@
gpointer data); gpointer data);
static void action_unmount_volume_callback (GtkAction *action, static void action_unmount_volume_callback (GtkAction *action,
@ -80,18 +80,19 @@
if (nautilus_file_has_volume (file)) { if (nautilus_file_has_volume (file)) {
*show_unmount = TRUE; *show_unmount = TRUE;
@@ -6481,6 +6514,10 @@ @@ -6481,6 +6514,11 @@
} else { } else {
*show_mount = TRUE; *show_mount = TRUE;
} }
+ +
+ if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY) { + if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
+ g_find_program_in_path ("gfloppy")) {
+ *show_format = TRUE; + *show_format = TRUE;
+ } + }
} else if (nautilus_file_is_nautilus_link (file)) { } else if (nautilus_file_is_nautilus_link (file)) {
uri = nautilus_file_get_activation_uri (file); uri = nautilus_file_get_activation_uri (file);
if (uri != NULL && if (uri != NULL &&
@@ -6507,32 +6544,38 @@ @@ -6507,32 +6545,38 @@
gboolean show_unmount; gboolean show_unmount;
gboolean show_eject; gboolean show_eject;
gboolean show_connect; gboolean show_connect;
@ -132,7 +133,7 @@
} }
/* We don't want both eject and unmount, since eject /* We don't want both eject and unmount, since eject
@@ -6556,6 +6599,10 @@ @@ -6556,6 +6600,10 @@
action = gtk_action_group_get_action (view->details->dir_action_group, action = gtk_action_group_get_action (view->details->dir_action_group,
FM_ACTION_EJECT_VOLUME); FM_ACTION_EJECT_VOLUME);
gtk_action_set_visible (action, show_eject); gtk_action_set_visible (action, show_eject);
@ -144,7 +145,7 @@
static void static void
--- nautilus-2.12.1/src/file-manager/nautilus-directory-view-ui.xml.format 2005-10-03 03:45:27.000000000 -0400 --- nautilus-2.12.1/src/file-manager/nautilus-directory-view-ui.xml.format 2005-10-03 03:45:27.000000000 -0400
+++ nautilus-2.12.1/src/file-manager/nautilus-directory-view-ui.xml 2005-10-21 09:44:06.000000000 -0400 +++ nautilus-2.12.1/src/file-manager/nautilus-directory-view-ui.xml 2005-10-21 10:35:58.000000000 -0400
@@ -147,6 +147,7 @@ @@ -147,6 +147,7 @@
<menuitem name="Mount Volume" action="Mount Volume"/> <menuitem name="Mount Volume" action="Mount Volume"/>
<menuitem name="Unmount Volume" action="Unmount Volume"/> <menuitem name="Unmount Volume" action="Unmount Volume"/>

5
nautilus.spec
View File

@ -18,7 +18,7 @@
Name: nautilus Name: nautilus
Summary: Nautilus is a file manager for GNOME. Summary: Nautilus is a file manager for GNOME.
Version: 2.12.1 Version: 2.12.1
Release: 2 Release: 3
License: GPL License: GPL
Group: User Interface/Desktops Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@ -169,6 +169,9 @@ scrollkeeper-update
%{_includedir}/nautilus %{_includedir}/nautilus
%changelog %changelog
* Fri Oct 21 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1-3
- Only show the "Format menu item if gfloppy is present
* Fri Oct 21 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1-2 * Fri Oct 21 2005 Matthias Clasen <mclasen@redhat.com> 2.12.1-2
- Add a "Format" context menu item to the floppy in "Computer" - Add a "Format" context menu item to the floppy in "Computer"