diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-04-05 21:37:57 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-04-05 21:37:57 +0000 |
| commit | 2c51fffebcb3bb7c59c4b7cf0618a3f915fc6041 (patch) | |
| tree | 54da37fa101ca8f51bc139e020587b1f0edd9536 | |
| parent | c64dd7dad3bbec1baa3accf526ba3876b708c783 (diff) | |
| download | nautilus-2c51fffebcb3bb7c59c4b7cf0618a3f915fc6041.tar.gz | |
Fixed bug 7986 ("Paste Files" disabled in trash:)
* src/file-manager/fm-directory-view.c:
(real_update_menus): Made "Paste Files" sensitivity depend
on is_read_only rather than can_create_files.
* src/file-manager/fm-search-list-view.c:
(fm_search_list_view_initialize_class), (real_is_read_only):
Made search list view override is_read_only instead of
supports_creating_files.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-search-list-view.c | 9 |
3 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,16 @@ +2001-04-05 John Sullivan <sullivan@eazel.com> + + Fixed bug 7986 ("Paste Files" disabled in trash:) + + * src/file-manager/fm-directory-view.c: + (real_update_menus): Made "Paste Files" sensitivity depend + on is_read_only rather than can_create_files. + + * src/file-manager/fm-search-list-view.c: + (fm_search_list_view_initialize_class), (real_is_read_only): + Made search list view override is_read_only instead of + supports_creating_files. + 2001-04-05 Ramiro Estrugo <ramiro@eazel.com> * libnautilus-extensions/nautilus-icon-container.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index e27bd1def..76f19d757 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3922,6 +3922,7 @@ real_update_menus (FMDirectoryView *view) const char *tip, *accelerator, *label; char *label_with_underscore; gboolean selection_contains_special_link; + gboolean is_read_only; gboolean can_create_files; gboolean can_delete_files; gboolean can_copy_files; @@ -3934,9 +3935,10 @@ real_update_menus (FMDirectoryView *view) selection_count = g_list_length (selection); selection_contains_special_link = special_link_in_selection (view); + is_read_only = fm_directory_view_is_read_only (view); can_create_files = fm_directory_view_supports_creating_files (view); - can_delete_files = !fm_directory_view_is_read_only (view) + can_delete_files = !is_read_only && selection_count != 0 && !selection_contains_special_link; can_copy_files = selection_count != 0 @@ -4108,7 +4110,7 @@ real_update_menus (FMDirectoryView *view) */ nautilus_bonobo_set_sensitive (view->details->ui, FM_DIRECTORY_VIEW_COMMAND_PASTE_FILES, - can_create_files); + !is_read_only); bonobo_ui_component_thaw (view->details->ui, NULL); diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c index f994954d8..803b7eadc 100644 --- a/src/file-manager/fm-search-list-view.c +++ b/src/file-manager/fm-search-list-view.c @@ -91,7 +91,7 @@ static void real_get_column_specification (FMListView *list_view static EelStringList * real_get_emblem_names_to_exclude (FMDirectoryView *view); static void real_file_limit_reached (FMDirectoryView *view); static void real_merge_menus (FMDirectoryView *view); -static gboolean real_supports_creating_files (FMDirectoryView *view); +static gboolean real_is_read_only (FMDirectoryView *view); static gboolean real_accepts_dragged_files (FMDirectoryView *view); static gboolean real_supports_properties (FMDirectoryView *view); static void load_location_callback (NautilusView *nautilus_view, @@ -402,8 +402,7 @@ fm_search_list_view_initialize_class (gpointer klass) real_get_emblem_names_to_exclude; fm_directory_view_class->file_limit_reached = real_file_limit_reached; fm_directory_view_class->merge_menus = real_merge_menus; - fm_directory_view_class->supports_creating_files = - real_supports_creating_files; + fm_directory_view_class->is_read_only = real_is_read_only; fm_directory_view_class->accepts_dragged_files = real_accepts_dragged_files; fm_directory_view_class->supports_properties = @@ -777,12 +776,12 @@ real_merge_menus (FMDirectoryView *view) } static gboolean -real_supports_creating_files (FMDirectoryView *view) +real_is_read_only (FMDirectoryView *view) { /* The user is not allowed to modify the contents of a search * results view. */ - return FALSE; + return TRUE; } static gboolean |