summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2023-08-23 22:30:14 -0400
committerlukefromdc <[email protected]>2024-02-02 14:02:51 -0500
commit488885550e472c30eea2308d2f27be633cb69bcc (patch)
tree7b5287e252503f09d082477afa00153a14ea502c
parent42307fec8a4c82895c1b39ce71b8fb49168eee35 (diff)
downloadcaja-488885550e472c30eea2308d2f27be633cb69bcc.tar.bz2
caja-488885550e472c30eea2308d2f27be633cb69bcc.tar.xz
fix gfile sort and symlink warnings w glib2.76 or later
*Use code borrowed from Nemo
-rw-r--r--libcaja-private/caja-directory-async.c2
-rw-r--r--libcaja-private/caja-file.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 8a9c021c..e9643615 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -3821,7 +3821,7 @@ static gboolean is_trusted_system_desktop_file (GFile *file)
return FALSE;
}
- target = g_file_info_get_symlink_target (info);
+ target = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
if (!target) {
goto done;
}
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 1ebfc71e..ddbdb1f1 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -2398,7 +2398,7 @@ update_info_internal (CajaFile *file,
}
file->details->size_on_disk = size_on_disk;
- 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;
}
@@ -2453,7 +2453,8 @@ update_info_internal (CajaFile *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 (eel_strcmp (file->details->symlink_name, symlink_name) != 0) {
changed = TRUE;
g_free (file->details->symlink_name);