diff options
Diffstat (limited to 'src/nautilus-file.c')
| -rw-r--r-- | src/nautilus-file.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c index caf0b4e69..ee1ff57c9 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2477,6 +2477,7 @@ update_info_internal (NautilusFile *file, const char *trash_orig_path; const char *group, *owner, *owner_real; gboolean free_owner, free_group; + const char *edit_name; if (file->details->is_gone) { @@ -2505,9 +2506,11 @@ update_info_internal (NautilusFile *file, } file->details->got_file_info = TRUE; + edit_name = g_file_info_get_attribute_string (info, + G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME); changed |= nautilus_file_set_display_name (file, g_file_info_get_display_name (info), - g_file_info_get_edit_name (info), + edit_name, FALSE); file_type = g_file_info_get_file_type (info); @@ -2552,14 +2555,18 @@ update_info_internal (NautilusFile *file, } } - is_symlink = g_file_info_get_is_symlink (info); + is_symlink = g_file_info_get_attribute_boolean (info, + G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK); if (file->details->is_symlink != is_symlink) { changed = TRUE; } file->details->is_symlink = is_symlink; - is_hidden = g_file_info_get_is_hidden (info) || g_file_info_get_is_backup (info); + is_hidden = g_file_info_get_attribute_boolean (info, + G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) || + g_file_info_get_attribute_boolean (info, + G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP); if (file->details->is_hidden != is_hidden) { changed = TRUE; @@ -2784,7 +2791,8 @@ update_info_internal (NautilusFile *file, } file->details->size = size; - sort_order = g_file_info_get_sort_order (info); + sort_order = g_file_info_get_attribute_int32 (info, + G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER); if (file->details->sort_order != sort_order) { changed = TRUE; @@ -2843,7 +2851,8 @@ update_info_internal (NautilusFile *file, file->details->thumbnailing_failed = thumbnailing_failed; } - symlink_name = g_file_info_get_symlink_target (info); + symlink_name = g_file_info_get_attribute_byte_string (info, + G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET); if (g_strcmp0 (file->details->symlink_name, symlink_name) != 0) { changed = TRUE; @@ -2851,7 +2860,8 @@ update_info_internal (NautilusFile *file, file->details->symlink_name = g_strdup (symlink_name); } - mime_type = g_file_info_get_content_type (info); + mime_type = g_file_info_get_attribute_string (info, + G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); if (mime_type == NULL) { mime_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); |