diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-25 16:27:53 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-25 16:27:53 +0800 |
commit | a00f58724f1e9beafc2e1b01b2666199edb127ec (patch) | |
tree | 2ec36a3b045141496af016d5d73744679a350b33 /x11-fm/nautilus2/files | |
parent | 86a919c3ed11737638f2f33007843f6bb3436c0a (diff) | |
download | marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar.gz marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar.bz2 marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar.lz marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar.xz marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.tar.zst marcuscom-ports-a00f58724f1e9beafc2e1b01b2666199edb127ec.zip |
Update to 2.5.8.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1910 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus2/files')
-rw-r--r-- | x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml | 31 | ||||
-rw-r--r-- | x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c | 19 |
2 files changed, 3 insertions, 47 deletions
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml deleted file mode 100644 index 81e3a2a71..000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml +++ /dev/null @@ -1,31 +0,0 @@ ---- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002 -+++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002 -@@ -3,10 +3,12 @@ - <filesystem name="affs" _default_volume_name="AFFS Volume"/> - <filesystem name="afs" _default_volume_name="AFS Network Volume"/> - <filesystem name="auto" _default_volume_name="Auto-detected Volume"/> -+ <filesystem name="cd9660" _default_volume_name="CDROM Volume"/> - <filesystem name="cdda" _default_volume_name="CD Digital Audio"/> - <filesystem name="cdrom" _default_volume_name="CD-ROM Drive"/> - <filesystem name="devfs" _default_volume_name="Hardware Device Volume"/> - <filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/> -+ <filesystem name="ext2fs" _default_volume_name="Ext2 Linux Volume" trash="yes"/> - <filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/> - <filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/> - <filesystem name="hfs" _default_volume_name="MacOS Volume" trash="yes"/> -@@ -15,10 +17,15 @@ - <filesystem name="hsfs" _default_volume_name="Hsfs CDROM Volume"/> - <filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/> - <filesystem name="hpfs" _default_volume_name="Windows NT Volume"/> -+ <filesystem name="linprocfs" _default_volume_name="System Volume"/> -+ <filesystem name="mfs" _default_volume_name="Memory Volume" trash="yes"/> - <filesystem name="minix" _default_volume_name="Minix Volume"/> - <filesystem name="msdos" _default_volume_name="MSDOS Volume"/> - <filesystem name="nfs" _default_volume_name="NFS Network Volume" trash="yes"/> -+ <filesystem name="ntfs" _default_volume_name="Windows NT Volume"/> -+ <filesystem name="nwfs" _default_volume_name="Netware Volume"/> - <filesystem name="proc" _default_volume_name="System Volume"/> -+ <filesystem name="procfs" _default_volume_name="System Volume"/> - <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/> - <filesystem name="smbfs" _default_volume_name="Windows Shared Volume" trash="yes"/> - <filesystem name="supermount" _default_volume_name="SuperMount Volume" /> diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c index 773f7bfea..5246e273c 100644 --- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c +++ b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c @@ -1,6 +1,6 @@ ---- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003 -+++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003 -@@ -4314,19 +4314,25 @@ +--- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004 ++++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004 +@@ -4476,19 +4476,25 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, @@ -29,16 +29,3 @@ nautilus_bonobo_set_hidden (view->details->ui, FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, !any_scripts); -@@ -5149,10 +5149,11 @@ - GList *selection, - gint selection_count) - { -- selection_count = g_list_length (selection); - gboolean can_paste_files_into; - gboolean selection_is_read_only; - gboolean is_read_only; -+ -+ selection_count = g_list_length (selection); - - selection_is_read_only = selection_count == 1 - && !nautilus_file_can_write (NAUTILUS_FILE (selection->data)); |