diff options
| author | Martin Wimpress <[email protected]> | 2015-09-24 10:31:14 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-09-24 10:31:14 +0100 |
| commit | ed33f9d0f57e0b32d85bc0f03d1783c39238449f (patch) | |
| tree | 07a53c01e5de639aae516c5877fb3c8f59c585b9 /libcaja-private/caja-file.c | |
| parent | a050471613f5b7092bce1c0ae87026e91c8e23b4 (diff) | |
| parent | 0c1b46500bf0e42f1f9abe3f9152d7604f41cfed (diff) | |
| download | caja-ed33f9d0f57e0b32d85bc0f03d1783c39238449f.tar.bz2 caja-ed33f9d0f57e0b32d85bc0f03d1783c39238449f.tar.xz | |
Merge pull request #459 from mate-desktop/undo-fix-1.10
[1.10] don't crash on Ctrl-Z after deleting file when original path isn't stored in trash
Diffstat (limited to 'libcaja-private/caja-file.c')
| -rw-r--r-- | libcaja-private/caja-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 2e3ad466..67b3328a 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -2459,7 +2459,7 @@ update_info_internal (CajaFile *file, } trash_time = 0; - time_string = g_file_info_get_attribute_string (info, "trash::deletion-date"); + time_string = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_TRASH_DELETION_DATE); if (time_string != NULL) { g_time_val_from_iso8601 (time_string, &g_trash_time); trash_time = g_trash_time.tv_sec; @@ -2469,7 +2469,7 @@ update_info_internal (CajaFile *file, file->details->trash_time = trash_time; } - trash_orig_path = g_file_info_get_attribute_byte_string (info, "trash::orig-path"); + trash_orig_path = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH); if (eel_strcmp (file->details->trash_orig_path, trash_orig_path) != 0) { changed = TRUE; g_free (file->details->trash_orig_path); |