summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-09-17 11:06:53 +0300
committermonsta <[email protected]>2015-09-17 11:45:42 +0300
commitb1e9a7fe429546105ffda8424cc5719a13e8a295 (patch)
tree1317fd81a22c0137b04aae648be79485036dcd1c
parentd2dd87abc30e850bc18cd15b854e0246a22db880 (diff)
downloadcaja-b1e9a7fe429546105ffda8424cc5719a13e8a295.tar.bz2
caja-b1e9a7fe429546105ffda8424cc5719a13e8a295.tar.xz
use standard defines for "trash::" attributes
-rw-r--r--libcaja-private/caja-file.c4
-rw-r--r--libcaja-private/caja-undostack-manager.c6
2 files changed, 6 insertions, 4 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);
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index 79778460..eff05a10 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -1974,7 +1974,9 @@ retrieve_files_to_restore (GHashTable * trashed)
G_FILE_ATTRIBUTE_STANDARD_NAME
","
G_FILE_ATTRIBUTE_TIME_MODIFIED
- ",trash::orig-path", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, FALSE, NULL);
+ ","
+ G_FILE_ATTRIBUTE_TRASH_ORIG_PATH,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, FALSE, NULL);
GHashTable *to_restore = g_hash_table_new_full (g_direct_hash,
g_direct_equal, g_object_unref, g_free);
@@ -1983,7 +1985,7 @@ retrieve_files_to_restore (GHashTable * trashed)
GFileInfo *info;
while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) {
/* Retrieve the original file uri */
- const char *origpath = g_file_info_get_attribute_byte_string (info, "trash::orig-path");
+ const char *origpath = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH);
GFile *origfile = g_file_new_for_path (origpath);
char *origuri = g_file_get_uri (origfile);
g_object_unref (origfile);