-
Darin Adler authored
with setting metadata before the metafile is read. * libnautilus-extensions/nautilus-directory.h: * libnautilus-extensions/nautilus-directory.c: (get_metadata_list_from_node), (nautilus_directory_get_metadata_list), (nautilus_directory_set_boolean_metadata), (nautilus_directory_set_integer_metadata), (nautilus_directory_get_file_metadata_node), (nautilus_directory_get_file_metadata_list), (nautilus_directory_set_file_metadata), (nautilus_directory_set_file_metadata_list), * libnautilus-extensions/nautilus-file.h: * libnautilus-extensions/nautilus-file.c: (nautilus_file_get_metadata), (nautilus_file_get_metadata_list), (nautilus_file_set_metadata), (nautilus_file_set_metadata_list), (nautilus_file_get_keywords), (nautilus_file_set_keywords): Unified code to deal with metadata lists and made both get and set work the same way. Also got rid of the default value. For lists, the default value is always NULL. * components/notes/ntl-notes.c: (notes_load_metainfo): * libnautilus-extensions/nautilus-directory-async.c: (nautilus_directory_monitor_add_internal), (nautilus_directory_call_when_ready_internal): * libnautilus-extensions/nautilus-directory-private.h: * libnautilus-extensions/nautilus-directory.h: * libnautilus-extensions/nautilus-directory.c: (nautilus_directory_call_when_ready), (nautilus_directory_file_monitor_add), (nautilus_self_check_directory): * libnautilus-extensions/nautilus-file.h: * libnautilus-extensions/nautilus-file.c: (nautilus_file_monitor_add), (nautilus_file_call_when_ready): * src/file-manager/fm-directory-view.c: (fm_directory_view_load_uri), (finish_loading_uri): * src/nautilus-index-title.c: (nautilus_index_title_set_uri): * src/ntl-uri-map.c: (set_initial_content_iid), (get_explicit_content_view_iids_from_metafile), (nautilus_navigation_info_new): Converted to use new API that specifies only that metadata is needed, not which keys. Maciej and I agreed that it's no use to specify which keys you are interested in when you can just get it wrong and have everything work anyway. Also the old API didn't work for metadata lists. * components/services/trilobite/sample/command-line/.cvsignore: Added generated files. * libnautilus-extensions/nautilus-xml-extensions.c: (nautilus_xml_get_property_for_children): Format tweak. * src/file-manager/fm-directory-view.c: (bonobo_menu_delete_callback), (bonobo_menu_duplicate_callback), (bonobo_menu_open_properties_window_callback), (display_selection_info), (notify_selection_change_callback), (queue_pending_files), (append_uri_one), (fm_directory_view_duplicate_selection), (fm_directory_view_trash_selection): Formatting tweaks.
e259c55e