8 files changed, 33 insertions, 23 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 7e808b9a8..390baad1a 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,19 +1,26 @@
+2000-02-22  Andy Hertzfeld <andy@eazel.com>
+
+	* icons/i-folder-192,96,72.png
+	hi-res versions of the standard gnome folder icon, contributed by Kenneth Christiansen
+	* icons/Makefile.am
+	include Kenneth's icons
+
 2000-02-21  Andy Hertzfeld <andy@eazel.com>
 
-    * icons/i-regular-192,96,72.png
-    hi-res versions of the standard gnome generic document icon, contributed by Kenneth Christiansen
-    * icons/Makefile.am
-    include Kenneth's icons
-    * libnautilus/nautilus-icons-controller.c,.h:
-    added a new method to get string properties
-    * libnautilus/nautilus-icons-view-icon-item.c:
-    draw the contents of a text file into the icon itself in a small font, if the
-    text_source property is set
-    * src/file-manager/fm-icons-controller.c:
-    routine to determine whether to draw into icons.  Since our mime-type detection is
-    inadequate now, we throw caution to the winds and assume an unknown type is a text file
-    it only enables this for eazel themes now, we have to figure out a better way to tell if
-    the icon can contain it
+	* icons/i-regular-192,96,72.png
+	hi-res versions of the standard gnome generic document icon, contributed by Kenneth Christiansen
+	* icons/Makefile.am
+	include Kenneth's icons
+	* libnautilus/nautilus-icons-controller.c,.h:
+	added a new method to get string properties
+	* libnautilus/nautilus-icons-view-icon-item.c:
+	draw the contents of a text file into the icon itself in a small font, if the
+	text_source property is set
+	* src/file-manager/fm-icons-controller.c:
+	routine to determine whether to draw into icons.  Since our mime-type detection is
+	inadequate now, we throw caution to the winds and assume an unknown type is a text file
+	it only enables this for eazel themes now, we have to figure out a better way to tell if
+	the icon can contain it
     
 2000-02-21  Maciej Stachowiak  <mjs@eazel.com>
 
diff --git a/icons/Makefile.am b/icons/Makefile.am
index ee9211fd4..170621d65 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -10,6 +10,9 @@ icon_DATA =					\
 	i-device.png				\
 	i-dirclosed.png				\
 	i-directory.png				\
+	i-directory-192.png			\
+	i-directory-72.png			\
+	i-directory-96.png			\
 	i-executable.png			\
 	i-fifo.png				\
 	i-floppy.png				\
diff --git a/icons/i-directory-192.png b/icons/i-directory-192.png
new file mode 100644
index 000000000..ff6b0ebeb
--- /dev/null
+++ b/icons/i-directory-192.png
diff --git a/icons/i-directory-72.png b/icons/i-directory-72.png
new file mode 100644
index 000000000..05b5216ec
--- /dev/null
+++ b/icons/i-directory-72.png
diff --git a/icons/i-directory-96.png b/icons/i-directory-96.png
new file mode 100644
index 000000000..153f59101
--- /dev/null
+++ b/icons/i-directory-96.png
diff --git a/libnautilus-extensions/nautilus-mime-type.c b/libnautilus-extensions/nautilus-mime-type.c
index ea06c77ec..f7645c254 100644
--- a/libnautilus-extensions/nautilus-mime-type.c
+++ b/libnautilus-extensions/nautilus-mime-type.c
@@ -43,10 +43,10 @@ typedef struct {
 /* FIXME:  this should be kept in a file somewhere, possibly using GConf or OAF */
 
 static MimeTypeItem mime_type_table [] = {
-	{ "text", "*",  "Edit with gEdit", "gedit" },
+	{ "text", "plain",  "Edit with gEdit", "gedit" },
 	{ "text", "html", "View with Netscape", "netscape" },
 	{ "image", "*", "Edit with GIMP",  "gimp" },
-	{ "text", "plain",  "Edit with gnotepad", "gnp" }
+	{ "text", "*",  "Edit with gnotepad", "gnp" }
 };
 
 /* release the storage contained in the passed-in command list */
@@ -76,7 +76,7 @@ GList* nautilus_mime_type_get_commands (const gchar *mime_type)
   gchar *target_base_type, *target_sub_type;
   NautilusCommandInfo *new_command_item;
   GList *command_list = NULL;
-
+  
   /* parse the mime type into a base type and a sub type */
   
   temp_str = strdup(mime_type);
diff --git a/libnautilus-private/nautilus-mime-type.c b/libnautilus-private/nautilus-mime-type.c
index ea06c77ec..f7645c254 100644
--- a/libnautilus-private/nautilus-mime-type.c
+++ b/libnautilus-private/nautilus-mime-type.c
@@ -43,10 +43,10 @@ typedef struct {
 /* FIXME:  this should be kept in a file somewhere, possibly using GConf or OAF */
 
 static MimeTypeItem mime_type_table [] = {
-	{ "text", "*",  "Edit with gEdit", "gedit" },
+	{ "text", "plain",  "Edit with gEdit", "gedit" },
 	{ "text", "html", "View with Netscape", "netscape" },
 	{ "image", "*", "Edit with GIMP",  "gimp" },
-	{ "text", "plain",  "Edit with gnotepad", "gnp" }
+	{ "text", "*",  "Edit with gnotepad", "gnp" }
 };
 
 /* release the storage contained in the passed-in command list */
@@ -76,7 +76,7 @@ GList* nautilus_mime_type_get_commands (const gchar *mime_type)
   gchar *target_base_type, *target_sub_type;
   NautilusCommandInfo *new_command_item;
   GList *command_list = NULL;
-
+  
   /* parse the mime type into a base type and a sub type */
   
   temp_str = strdup(mime_type);
diff --git a/libnautilus/nautilus-mime-type.c b/libnautilus/nautilus-mime-type.c
index ea06c77ec..f7645c254 100644
--- a/libnautilus/nautilus-mime-type.c
+++ b/libnautilus/nautilus-mime-type.c
@@ -43,10 +43,10 @@ typedef struct {
 /* FIXME:  this should be kept in a file somewhere, possibly using GConf or OAF */
 
 static MimeTypeItem mime_type_table [] = {
-	{ "text", "*",  "Edit with gEdit", "gedit" },
+	{ "text", "plain",  "Edit with gEdit", "gedit" },
 	{ "text", "html", "View with Netscape", "netscape" },
 	{ "image", "*", "Edit with GIMP",  "gimp" },
-	{ "text", "plain",  "Edit with gnotepad", "gnp" }
+	{ "text", "*",  "Edit with gnotepad", "gnp" }
 };
 
 /* release the storage contained in the passed-in command list */
@@ -76,7 +76,7 @@ GList* nautilus_mime_type_get_commands (const gchar *mime_type)
   gchar *target_base_type, *target_sub_type;
   NautilusCommandInfo *new_command_item;
   GList *command_list = NULL;
-
+  
   /* parse the mime type into a base type and a sub type */
   
   temp_str = strdup(mime_type);