No parameters is indicated by "(void)" instead of "()".

	* components/help/help-method.c: (help_uri_new): No parameters
	is indicated by "(void)" instead of "()".
	(help_uri_to_string): Changed to share more code (I think I might
	have fixed a leak too).
	(init_help_module): No parameters is indicated by "(void)"
	instead of "()". Also fixed a bug where the wrong lock is unlocked.
	(convert_file_to_uri): Use g_strcasecmp instead of strcmp since we
	are checking MIME types.
	(transform_file), (transform_absolute_file), (file_from_path),
	(find_help_file), (transform_relative_file): Merged these so they
	share a lot of common code.

	* components/services/vault/command-line/vault-operations.c:
	(vault_list): Fixed a g_strconcat that was missing a trailing NULL.

	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-file-attributes.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(cancel_top_left_read), (top_left_read_done),
	(top_left_read_callback), (top_left_read_more_callback),
	(start_getting_top_lefts), Changed top_left code to use
	nautilus_read_file calls.
	(cancel_metafile_read),
	Changed to reflect name changes in nautilus_read_file calls.
	(cancel_get_activation_uri), (nautilus_directory_cancel),
	(set_up_request_by_file_attributes),
	(nautilus_async_destroying_file), (lacks_activation_uri),
	(wants_activation_uri), (request_is_satisfied),
	(activation_uri_found),
	(activation_uri_nautilus_link_read_callback),
	(activation_uri_gmc_link_read_callback),
	(activation_uri_gmc_link_read_more_callback),
	(start_getting_activation_uris),
	(nautilus_directory_async_state_changed): Add code to fetch
	activation URIs for either GMC or Nautilus-style link files.
	(lacks_top_left): Changed to share common
	nautilus_file_should_get_top_left_text function so we don't have
	lots of different code reading the preferences about top-left
	text.
	(is_needy): Enhanced and renamed is_wanted so it takes into
	account files that are and aren't interesting.
	(start_getting_directory_counts), (deep_count_start):
	(start_getting_file_info), Change to use is_needy.

	* libnautilus-extensions/nautilus-directory.h:
	* libnautilus-extensions/nautilus-directory.c:
	Tweaked spacing.

	* libnautilus-extensions/nautilus-file-private.h:
	Added a self_owned flag so we do better with files that don't have
	parent directories and the fields to support activation_uri.

	* libnautilus-extensions/nautilus-file-utilities.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	(read_file_close_callback), (read_file_close),
	(read_file_succeeded), (read_file_failed),
	(read_file_read_callback), (read_file_read_chunk),
	(read_file_open_callback), (nautilus_read_file_async),
	(nautilus_read_entire_file_async), (nautilus_read_file_cancel):
	Added a variation of the read file call that takes a function to
	decide whether to keep reading or not.

	* libnautilus-extensions/nautilus-file.h:
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_new_from_name), (nautilus_file_get),
	(nautilus_file_get_parent_uri_as_string),
	(get_file_for_parent_directory), (nautilus_file_rename),
	(nautilus_file_get_gnome_vfs_uri),
	(nautilus_file_get_uri),
	Add code that handles the "self_owned" flag to make files without
	parents work better.
	(destroy): Fixed some leaks I noticed.
	(nautilus_file_get_top_left_text),
	(nautilus_file_should_get_top_left_text): Added this so that all
	code can share a single call when deciding whether to get text
	based on local vs. non-local.
	(nautilus_file_get_activation_uri): Changed to work with new
	async. code to fetch this.

	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_for_file): Call
	nautilus_file_should_get_top_left_text.

	* libnautilus-extensions/nautilus-link.h:
	* libnautilus-extensions/nautilus-link.c:
	(nautilus_link_is_link_file_name): Named so it's clear it looks
	at the file name only.
	(xml_get_root_property), (nautilus_link_get_root_property):
	Added these to share a lot of common code.
	(nautilus_link_get_additional_text): Use the new calls.
	(make_local_path), (icon_read_done_callback),
	(nautilus_link_get_image_uri), (nautilus_link_get_link_uri),
	(nautilus_link_get_display_name): Other cleanup and rewrite.
	(nautilus_link_get_link_uri_given_file_contents): Add API that
	can work with the async. I/O version.

	* libnautilus-extensions/nautilus-stock-dialogs.c:
	(timed_wait_free), (nautilus_timed_wait_start):
	Added some asserts.

	* src/file-manager/fm-directory-view.c: (activate_callback),
	(fm_directory_view_activate_file): Use call_when_ready and
	the new async. stuff.

	* src/file-manager/fm-error-reporting.c:
	(fm_report_error_setting_group): Added a (low-quality) error
	message for the case where you aren't alowed to change the
	group of something.

	* src/file-manager/fm-icon-view.c:
	(icon_position_changed_callback): Added missing NULL in a call
	to g_strconcat.
	(get_icon_text_callback): Fix storage leak.

	* src/file-manager/fm-properties-window.c:
	(activate_owner_callback): Fixed a timed_wait_start/stop mismatch
	that was causing an assert and other badness when you changed the
	owner.

	* src/file-manager/fm-search-list-view.c:
	(get_attribute_from_column): Added a missing case to prevent a
	crash, but had to put in a FIXME since the code isn't really working.

	* src/nautilus-application.c: (nautilus_application_startup):
	Fixed bug where you wouldn't see error messages on startup.  Also
	improved one of the error messages by adding some blank lines.

1 files changed, 1 insertions, 4 deletions

diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 39386876a..6f25b0490 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -158,12 +158,9 @@ gboolean           nautilus_directory_are_all_files_seen   (NautilusDirectory
  */
 gboolean           nautilus_directory_metadata_loaded      (NautilusDirectory         *directory);
 
-/* Return true if the directory is local.
- */
+/* Return true if the directory is local. */
 gboolean           nautilus_directory_is_local             (NautilusDirectory         *directory);
 
-
-
 typedef struct NautilusDirectoryDetails NautilusDirectoryDetails;
 
 struct NautilusDirectory