added code to make sure we use the generic document icon for text files so

added code to make sure we use the generic document icon for
	text files so that the text-in-icons feature works.  Also,
	update the non-anti-aliased document icons in the eazel theme so
	they're consistent with the anti-aliased ones.

ChangeLog

@@ -1,3 +1,20 @@
+2000-07-17  Andy Hertzfeld  <set EMAIL_ADDRESS environment variable>
+
+	* libnautilus-extensions/nautilus-icon-factory.c:
+	(nautilus_icon_factory_get_icon_name_for_regular_file):
+	added code to make sure that we use the generic document icon for
+	text files so that the text-in-icons feature works, even if the
+	more specific gnome ones are installed.
+	
+	* icons/eazel/i-regular.png:
+	* icons/eazel/i-regular-12.png:
+	* icons/eazel/i-regular-24.png:
+	* icons/eazel/i-regular-36.png:
+	* icons/eazel/i-regular-72.png:
+	* icons/eazel/i-regular-96.png:
+	new icons from Susan for the non-anti-aliased case that are
+	consistent with the anti-aliased one.
+		
 2000-07-17  Pavel Cisler <pavel@eazel.com>
 
 	* libnautilus-extensions/nautilus-list.c:

libnautilus-extensions/nautilus-icon-factory.c

@@ -499,9 +499,12 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 {
         char *mime_type;
         const char *icon_name;
-
+	gboolean is_text_file;
+	
         mime_type = nautilus_file_get_mime_type (file);
-        if (mime_type != NULL) {
+        is_text_file = mime_type != NULL && nautilus_str_has_prefix (mime_type, "text/");
+	
+	if (mime_type != NULL && !is_text_file) {
                 icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
 		g_free (mime_type);
 		if (icon_name != NULL) {
@@ -512,7 +515,7 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	/* gnome_vfs_mime didn't give us an icon name, so we have to
          * fall back on default icons.
 	 */
-	if (nautilus_file_is_executable (file)) {
+	if (nautilus_file_is_executable (file) & !is_text_file) {
 		return ICON_NAME_EXECUTABLE;
 	}
 	return ICON_NAME_REGULAR;

libnautilus-private/nautilus-icon-factory.c

@@ -499,9 +499,12 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 {
         char *mime_type;
         const char *icon_name;
-
+	gboolean is_text_file;
+	
         mime_type = nautilus_file_get_mime_type (file);
-        if (mime_type != NULL) {
+        is_text_file = mime_type != NULL && nautilus_str_has_prefix (mime_type, "text/");
+	
+	if (mime_type != NULL && !is_text_file) {
                 icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
 		g_free (mime_type);
 		if (icon_name != NULL) {
@@ -512,7 +515,7 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	/* gnome_vfs_mime didn't give us an icon name, so we have to
          * fall back on default icons.
 	 */
-	if (nautilus_file_is_executable (file)) {
+	if (nautilus_file_is_executable (file) & !is_text_file) {
 		return ICON_NAME_EXECUTABLE;
 	}
 	return ICON_NAME_REGULAR;