reviewed by: John Sullivan <sullivan@eazel.com>

	Some enhancements to icon lookup.

	* libnautilus-extensions/nautilus-icon-factory.h:
	* libnautilus-extensions/nautilus-icon-factory.c:
	(get_mime_type_icon_without_suffix): Function used to strip suffixes
	out so we can have file suffixes in the gnome-vfs icon database, but
	can ignore them and look at all suffixes for the named icon.
	(make_icon_name_from_mime_type): Construct an icon name for types
	that don't specify a particular icon. This allows theme designers
	to make icons for any MIME type.
	(get_icon_name_for_regular_file): Use the new "without suffix" call.
	This requires changing this function to return a strdup'd name.
	(get_icon_name_for_directory), (get_icon_name_for_file): Change to
	return a strdup'd name.
	(make_full_icon_path): Do the file exists check in here (was
	already doing it in some cases) and also call
	gnome_vfs_icon_path_from_filename.
	(get_themed_icon_file_path): Get rid of redundant g_file_exists
	checks and gnome_vfs_icon_path_from_filename call, since both are
	now handled inside make_full_icon_path.
	(nautilus_scalable_icon_get_text_pieces),
	(nautilus_scalable_icon_new_from_text_pieces),
	(nautilus_scalable_icon_unref), (nautilus_scalable_icon_hash),
	(nautilus_scalable_icon_equal): Add MIME type to the scalable
	icons.
	(nautilus_icon_factory_get_icon_for_file): Pass in the MIME type.
	(nautilus_icon_factory_get_emblem_icon_by_name): Pass NULL for
	MIME type.
	(load_pixbuf_svg): Change to pass in boolean for emblem hack since
	we don't always have an icon name.
	(load_icon_from_path): New function, share common code.
	(load_named_icon): New function, share common code.
	(load_specific_icon): Try icon based on MIME type first, then fall
	back on the name specified.
	(nautilus_icon_factory_get_pixbuf_from_name): Pass NULL for MIME
	type.
	(load_icon_with_embedded_text): Pass in the MIME type.

	* src/nautilus-bookmark-list.c: (append_bookmark_node):
	* src/nautilus-bookmark-parsing.c:
	(nautilus_bookmark_new_from_node):
	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_icon_is_different),
	(nautilus_bookmark_set_icon_to_default):
	Update to deal with MIME types in scalable icons.

	* components/help/hyperbola-filefmt.c:
	(fmt_scrollkeeper_parse_toc_section),
	(fmt_scrollkeeper_parse_doc_toc),
	(fmt_scrollkeeper_parse_document),
	(fmt_scrollkeeper_parse_section), (fmt_scrollkeeper_parse_xml),
	(fmt_scrollkeeper_trim_empty_branches),
	(fmt_scrollkeeper_tree_empty), (fmt_scrollkeeper_populate_tree),
	(remove_leading_and_trailing_white_spaces), (fmt_toplevel_add_doc),
	(get_path_from_node), (has_content), (fmt_toplevel_parse_xml_tree):
	Made more compatible with libxml by not using the content field
	directly and using xmlChildrenNode and xmlRootNode.

	* libnautilus-extensions/nautilus-trash-monitor.c:
	(nautilus_trash_monitor_get): Fixed NautilusDirectory leak.

	* THANKS: Added some more translator credits.
	* check-THANKS.pl: Fixed some email addresses and such.

	* icons/ardmore/.cvsignore:
	* icons/arlo/.cvsignore,
	* icons/arlo/backgrounds/.cvsignore:
	* icons/arlo/sidebar_tab_pieces/.cvsignore:
	* icons/villanova/.cvsignore:
	Removed these again.

1 files changed, 10 insertions, 7 deletions

diff --git a/check-THANKS.pl b/check-THANKS.pl
index d54874631..3e01b3480 100755
--- a/check-THANKS.pl
+++ b/check-THANKS.pl
@@ -4,7 +4,7 @@
 #
 #  Nautilus
 #
-#  Copyright (C) 2000 Eazel, Inc.
+#  Copyright (C) 2000, 2001 Eazel, Inc.
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
 #  along with this library; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-#  Author: Maciej Stachowiak
+#  Author: Maciej Stachowiak <mjs@eazel.com>
 #
 
 # check-THANKS.pl: Checks for users mentioned in one of the ChangeLogs
@@ -53,6 +53,7 @@ my %name_map =
 
 my %email_map =
   (
+   'almer1@dds.nl' => 'almer@gnome.org',
    'arik@gnome.org' => 'arik@eazel.com',
    'at@ue-spacy.com' => 'tagoh@gnome.gr.jp',
    'baulig@suse.de' => 'martin@home-of-linux.org',
@@ -64,6 +65,7 @@ my %email_map =
    'kabalak@gtranslator.org' => 'kabalak@kabalak.net',
    'kmaraas@gnu.org' => 'kmaraas@gnome.org',
    'kmaraas@online.no' => 'kmaraas@gnome.org',
+   'linux@chrisime.de' => 'chrisime@gnome.org',
    'linuxfan@ionet..net' => 'josh@whitecape.org',
    'linuxfan@ionet.net' => 'josh@whitecape.org',
    'mathieu@gnome.org' => 'mathieu@eazel.com',
@@ -79,12 +81,13 @@ my %email_map =
 
 
 # Some ChangeLog lines that carry no credit (incorrect changes that
-# had to be reverted, etc)
+# had to be reverted, changes done for someone else, etc.)
 
 my %no_credit =
   (
    '2000-09-08  Daniel Egger  <egger@suse.de>' => 1,
-   '2000-09-06  Daniel Egger  <egger@suse.de>' => 1
+   '2000-09-06  Daniel Egger  <egger@suse.de>' => 1,
+   '2001-04-25  Changwoo Ryu  <cwryu@debian.org>' => 1,
   );
 
 
@@ -272,19 +275,19 @@ if (@double_credited)
           {
             print "${person}\n";
           }
-  
+        
         $printed = 1;
       }
 
     if (@only_in_about)
       {
         print "\nThe following people are in the about screen but not AUTHORS:\n\n";
-    
+        
         foreach my $person (@only_in_about)
           {
             print "${person}\n";
           }
-    
+        
         $printed = 1;
       }
   }