Fixed bugs relating to multiple directory and file objects for the same

	* libnautilus/nautilus-directory-private.h,
	libnautilus/nautilus-directory.c, libnautilus/nautilus-file.c
	(nautilus_directory_find_file, compare_file_with_name,
	nautilus_directory_get, nautilus_file_get): Fixed bugs relating to
	multiple directory and file objects for the same entity. Stripped
	trailing '/' characters in nautilus_directory_get and changed
	nautilus_file_get to return already-existing files instead of
	always creating new ones. Added self-checks to make sure this
	works.

	* libnautilus/nautilus-directory.c
	(nautilus_directory_try_to_read_metafile): Fixed bug where
	metafile reading would fail. The gnome-xml parser requires a null
	character at the end of the file, even though the size is passed
	in!

	* libnautilus/nautilus-directory.c
	(nautilus_directory_remove_write_metafile_idle,
	nautilus_directory_finalize,
	nautilus_directory_try_to_write_metafile,
	nautilus_directory_request_write_metafile, ): Changed metafile
	writing so it always happens at idle time.

	* libnautilus/nautilus-directory.c
	(nautilus_directory_try_to_read_metafile): Fixed bug where
	metafile reading would fail. The gnome-xml parser requires a null
	character at the end of the file, even though the size is passed
	in!

	* libnautilus/nautilus-lib-self-check-functions.h: Changed order
	so lower-level tests come before higher-level ones.

	* libnautilus/nautilus-string.h, libnautilus/nautilus-string.c:
	Renamed functions:
		nautilus_has_prefix -> nautilus_str_has_prefix
		nautilus_strdup_prefix -> nautilus_str_get_prefix
		nautilus_has_suffix -> nautilus_str_has_suffix
		nautilus_strstrip -> nautilus_str_strip_chr
		nautilus_string_to_int -> nautilus_str_to_int
		nautilus_eat_string_to_int -> nautilus_eat_str_to_int
	Changed nautilus_str_strip_chr not to modify in place.
	Added nautilus_str_strip_trailing_chr.

	* components/music/nautilus-music-view.c (is_mp3_file,
	nautilus_music_view_update_from_uri),
	libnautilus/nautilus-icon-factory.c
	(nautilus_icon_factory_get_icon_for_file, make_thumbnail_path,
	load_specific_image), libnautilus/nautilus-icons-view-icon-item.c
	(draw_mini_text), src/ntl-index-panel.c (command_button_cb,
	add_command_buttons), src/ntl-window-msgs.c
	(nautilus_window_change_location_2),
	src/file-manager-fm-directory-view-icons.c
	(fm_directory_view_icons_compute_menu_item_info),
	src/file-manager/fm-directory-view.c (compute_menu_item_info),
	src/file-manager/fm-icons-controller.c
	(fm_icons_controller_get_icon_property): Switched callers to use
	new names for string calls.

	* libnautilus/gnome-icon-container.c (destroy): Reformatting.

	* components/help/converters/gnome-info2html2/main.c (main):
	Fixed a warning.

1 files changed, 4 insertions, 3 deletions

diff --git a/libnautilus/nautilus-icon-factory.c b/libnautilus/nautilus-icon-factory.c
index 07bd4a541..bbbd304d0 100644
--- a/libnautilus/nautilus-icon-factory.c
+++ b/libnautilus/nautilus-icon-factory.c
@@ -610,7 +610,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file)
 	   or use a thumbnail if one exists.  If a thumbnail is required, but does not yet exist,
 	   put an entry on the thumbnail queue so we eventually make one */
 	   
-	if (uri == NULL && nautilus_has_prefix (nautilus_file_get_mime_type (file), "image/")) {
+	if (uri == NULL && nautilus_str_has_prefix (nautilus_file_get_mime_type (file), "image/")) {
 		if (nautilus_file_get_size (file) < SELF_THUMBNAIL_SIZE_THRESHOLD)
 			uri = nautilus_file_get_uri (file);
 		else
@@ -686,7 +686,8 @@ make_thumbnail_path (const char *image_uri, gboolean directory_only)
 	if (directory_only)
 		thumbnail_uri = g_strdup_printf ("%s/.thumbnails", temp_str);
 	else {
-		if (nautilus_has_suffix (image_uri, ".png") || nautilus_has_suffix (image_uri, ".PNG")) {
+		if (nautilus_str_has_suffix (image_uri, ".png")
+		    || nautilus_str_has_suffix (image_uri, ".PNG")) {
 			thumbnail_uri = g_strdup_printf ("%s/.thumbnails/%s", temp_str, last_slash + 1);
 		} else {
 			thumbnail_uri = g_strdup_printf ("%s/.thumbnails/%s.png", temp_str, last_slash + 1);
@@ -869,7 +870,7 @@ load_specific_image (NautilusScalableIcon *scalable_icon,
 		 * and gdk-pixbuf.
 		 */
 		if (size_in_pixels == NAUTILUS_ICON_SIZE_STANDARD
-		    && nautilus_has_prefix (scalable_icon->uri, "file://")) {
+		    && nautilus_str_has_prefix (scalable_icon->uri, "file://")) {
 			return gdk_pixbuf_new_from_file (scalable_icon->uri + 7);
 		}