summaryrefslogtreecommitdiff
path: root/libnautilus-extensions/nautilus-file.c
diff options
context:
space:
mode:
authorAndy Hertzfeld <andy@src.gnome.org>2000-10-13 19:22:28 +0000
committerAndy Hertzfeld <andy@src.gnome.org>2000-10-13 19:22:28 +0000
commitfeab4ceef40ff06a996ccf4e620adae4d72dbbaf (patch)
treebfe13263268eb485736813e2bec755884236cce8 /libnautilus-extensions/nautilus-file.c
parentb82831fca0e5e1b264cb996681405820d65dd155 (diff)
downloadnautilus-feab4ceef40ff06a996ccf4e620adae4d72dbbaf.tar.gz
fixed bug 3711, sidebar says home directory is a "program", by explicitly
* libnautilus-extensions/nautilus-file.c: (nautilus_file_get_type_as_string): fixed bug 3711, sidebar says home directory is a "program", by explicitly checking nautilus_file_is_directory if the mime-type is NULL and returning "folder" in that case. * src/nautilus-window-toolbars.c: (nautilus_window_initialize_toolbars): added some padding around the throbber to better position it in the toolbar.
Diffstat (limited to 'libnautilus-extensions/nautilus-file.c')
-rw-r--r--libnautilus-extensions/nautilus-file.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c
index f01b075e4..f81c5b264 100644
--- a/libnautilus-extensions/nautilus-file.c
+++ b/libnautilus-extensions/nautilus-file.c
@@ -3320,6 +3320,10 @@ nautilus_file_get_type_as_string (NautilusFile *file)
if (nautilus_strlen (mime_type) == 0) {
/* No mime type, anything else interesting we can say about this? */
+ /* if it's a directory, call it that before looking at executable */
+ if (nautilus_file_is_directory (file)) {
+ return type_as_string_considering_link (file, _("folder"));
+ }
if (nautilus_file_is_executable (file)) {
return type_as_string_considering_link (file, _("program"));
}