| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* libnautilus-extensions/nautilus-directory.c:
(nautilus_directory_notify_files_removed,
nautilus_directory_notify_files_moved): Use
`nautilus_file_get_existing', not `nautilus_file_get', to check if
a file is already known. `nautilus_file_get' would have created
new NautilusFiles and NautilusDirectories only to do redundant
notification later in the function. Also, the old code was a bit
silly because `nautilus_file_get' only returns NULL for a NULL
URI.
Work towards bug 3362, eliminate directory metadata.
* libnautilus-extensions/nautilus-file-attributes.h: Added
NAUTILUS_FILE_ATTRIBUTE_METADATA attribute.
* libnautilus-extensions/nautilus-directory-async.c
(set_up_request_by_file_attributes):
* libnautilus-extensions/nautilus-wait-until-ready.h,
libnautilus-extensions/nautilus-file.h,
libnautilus-extensions/nautilus-directory.h,
libnautilus-extensions/nautilus-directory.c,
libnautilus-extensions/nautilus-file.c
(nautilus_directory_call_when_ready,
nautilus_directory_wait_until_ready,
nautilus_directory_file_monitor_add,
nautilus_self_check_directory, nautilus_file_monitor_add,
nautilus_file_call_when_ready, nautilus_file_wait_until_ready):
Remove monitor_metadata or wait_for_metadata attribtues from these
calls; the new way to do it is to monitor or wait for the METADATA
file attribute.
* libnautilus-extensions/nautilus-directory-private.h
libnautilus-extensions/nautilus-directory-async.c:
(nautilus_directory_monitor_add_internal,
nautilus_directory_call_when_ready_internal,
nautilus_directory_check_if_ready_internal): Eliminate
monitor_metadata, wait_for_metadata, etc arguments.
* libnautilus-extensions/nautilus-merged-directory.c:
(merged_callback_connect_directory), (merged_call_when_ready),
(merged_file_monitor_add), (monitor_add_directory):
* libnautilus-extensions/nautilus-vfs-directory.c:
(vfs_call_when_ready), (vfs_file_monitor_add):
* libnautilus-extensions/nautilus-directory-background.c
(nautilus_connect_background_to_directory_metadata): Monitor
metadata the new approved way.
* libnautilus-extensions/nautilus-mime-actions.c
(nautilus_directory_wait_for_metadata,
nautilus_mime_get_default_component_for_uri_internal,
nautilus_mime_get_short_list_components_for_uri,
nautilus_mime_get_all_components_for_uri,
get_mime_type_from_file): Wait for metadata the new approved way.
* src/file-manager/fm-directory-view.c
(fm_directory_view_activate_file, fm_directory_view_load_uri,
finish_loading_uri, metadata_ready_callback):
Monitor/call_when_ready using the new API.
* src/file-manager/fm-properties-window.c:
(create_properties_window, fm_properties_window_present):
Monitor/call_when_ready using the new API.
* src/file-manager/fm-search-list-view.c (real_adding_file):
Monitor/call_when_ready using the new API.
* src/file-manager/nautilus-trash-monitor.c
(nautilus_trash_monitor_initialize): Monitor/call_when_ready using
the new API.
* src/nautilus-applicable-views.c (nautilus_navigation_info_new):
Monitor/call_when_ready using the new API.
* components/notes/nautilus-notes.c (notes_load_metainfo):
Monitor/call_when_ready using the new API.
* components/tree/nautilus-tree-model.c:
(nautilus_tree_model_monitor_add,
nautilus_tree_model_monitor_node): Monitor/call_when_ready using the new API.
* src/nautilus-sidebar-title.c, src/nautilus-sidebar-title.h
(nautilus_sidebar_title_set_uri): Monitor/call_when_ready using
the new API, and use file metadata instead of directory metadata.
* src/nautilus-sidebar.c (nautilus_sidebar_destroy,
nautilus_sidebar_add_panel_items,
nautilus_sidebar_background_is_default, receive_dropped_uri_list,
receive_dropped_color, receive_dropped_keyword,
(background_settings_changed_callback,
background_appearance_changed_callback, background_reset_callback,
open_with_callback, nautilus_sidebar_update_buttons,
nautilus_sidebar_update_appearance, nautilus_sidebar_set_uri):
Monitor/call_when_ready using the new API, and use file metadata
instead of directory metadata. Keep around a NautilusFile
representing the current sidebar location, simplifying bunches of
code and hopefully eliminating potential redundant I/O.
* src/nautilus-window-manage-views.c
(viewed_file_changed_callback, position_and_show_window_callback,
nautilus_window_end_location_change_callback):
Monitor/call_when_ready using the new API, and use file metadata
instead of directory metadata. Keep around a NautilusFile
representing the current sidebar location, simplifying bunches of
code and hopefully eliminating potential redundant I/O.
* src/nautilus-window.c (nautilus_window_save_geometry): Use file
metadata instead of directory metadata.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* components/services/install/lib/eazel-install-rpm-glue.c:
(eazel_uninstall_downward_traverse):
* libnautilus-extensions/nautilus-merged-directory.c:
(nautilus_merged_directory_add_real_directory):
* libnautilus-extensions/nautilus-mime-actions.c:
(make_oaf_query_with_known_mime_type),
(make_oaf_query_with_uri_scheme_only):
* libnautilus-extensions/nautilus-preferences.c:
(nautilus_preferences_set_string_list):
* libnautilus-extensions/nautilus-program-chooser.c:
(program_file_pair_compute_status), (get_supertype_from_file):
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_scalable_font_measure_text):
* libnautilus/nautilus-view.c: (view_frame_call_begin):
* nautilus-installer/src/support.c: (create_pixmap),
(create_image):
* src/file-manager/fm-desktop-icon-view.c: (create_mount_link),
(volume_unmounted_callback), (place_home_directory):
* src/file-manager/fm-icon-view.c: (get_next_position),
(play_file), (get_icon_text_callback):
* src/file-manager/fm-list-view.c: (fm_list_view_initialize),
(create_list), (fm_list_view_set_zoom_level),
(fm_list_view_font_family_changed):
* src/file-manager/nautilus-indexing-info.c:
(nautilus_indexing_info_show_dialog):
* src/nautilus-application.c: (nautilus_application_startup):
* src/nautilus-first-time-druid.c:
(next_proxy_configuration_page_callback), (initiate_file_download):
* src/nautilus-property-browser.c: (add_background_to_browser):
* src/nautilus-shell.c:
|
|
|
from all volumes). Some loose ends are already reported in bugs
2146, 2243, and 2244.
* libnautilus-extensions/Makefile.am:
* libnautilus-extensions/nautilus-merged-directory.h:
* libnautilus-extensions/nautilus-merged-directory.c:
Moved all the guts of NautilusTrashDirectory that are solely
about having a single directory that's a union of a bunch of
real directories into a separate base class. Also finished the
implementation, leaving only unimportant loose ends.
* libnautilus-extensions/nautilus-trash-directory.h:
* libnautilus-extensions/nautilus-trash-directory.c:
(get_volume_vfs_uri_if_writable), (find_directory_callback),
(add_volume), (remove_trash_volume), (remove_volume),
(add_one_volume), (volume_mounted_callback),
(volume_unmounted_callback), (nautilus_trash_directory_initialize),
(remove_trash_volume_cover), (trash_destroy),
(nautilus_trash_directory_initialize_class):
Added the code to find the trash on all volumes.
* libnautilus-extensions/nautilus-glib-extensions.h:
* libnautilus-extensions/nautilus-glib-extensions.c:
(flatten_hash_table_element),
(nautilus_g_hash_table_safe_for_each): Added a new version of the
hash table iterator that works even if the callback removes items
from the hash table.
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_scalable_font_largest_fitting_font_size): Added code to
handle the case of an empty name; the old code worked with NULL,
but not with "".
* src/file-manager/fm-desktop-icon-view.c:
(fm_desktop_icon_view_trash_state_changed_callback),
(find_and_rename_trash_link), (create_or_rename_trash):
* src/file-manager/nautilus-trash-monitor.c:
(nautilus_trash_monitor_initialize):
Changed to use the new "trash:" URL instead of locating one of
the trash folders.
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize_class),
(fm_directory_all_selected_items_in_trash):
* src/file-manager/fm-search-list-view.c:
(fm_search_list_view_initialize_class):
The "share_parent" optimization didn't work for the new trash.
Instead of fixing it, I just removed it.
* src/nautilus-window-manage-views.c: (compute_default_title),
(nautilus_window_update_title): Made two changes to the default
title: 1) Use "" instead of "Nautilus" when there's no title.
We still use "Nautilus" in the window title, but not in the
sidebar any more. 2) Use the scheme part of a URI if there's
nothing after the colon. This works nicely for the trash.
* libnautilus-extensions/nautilus-background-canvas-group.c:
(nautilus_background_canvas_group_render): Removed some unneeded
code and the FIXME that goes with it.
* libnautilus-extensions/nautilus-directory.c:
(nautilus_directory_is_not_empty): Removed an overzealous assert.
|
