luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/oholy/lost-and-found-is-hidden' into 'main'

Browse Source 
glocalfileinfo: Mark the lost+found dir as hidden again

See merge request GNOME/glib!3310
This commit is contained in:
Philip Withnall 2023-03-06 17:47:46 +00:00
commit ff2fad77ef
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfile.c
View File

@ -1929,7 +1929,7 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
return res; return res;
} }
#ifdef G_OS_UNIX #ifndef G_OS_WIN32
gboolean gboolean
_g_local_file_is_lost_found_dir (const char *path, dev_t path_dev) _g_local_file_is_lost_found_dir (const char *path, dev_t path_dev)
{ {

9
gio/glocalfileinfo.c
View File

@ -2034,11 +2034,6 @@ _g_local_file_info_get (const char *basename,
if (stat_ok) if (stat_ok)
set_info_from_stat (info, &statbuf, attribute_matcher); set_info_from_stat (info, &statbuf, attribute_matcher);
#ifdef G_OS_UNIX
if (stat_ok && _g_local_file_is_lost_found_dir (path, _g_stat_dev (&statbuf)))
g_file_info_set_is_hidden (info, TRUE);
#endif
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
if (_g_file_attribute_matcher_matches_id (attribute_matcher, if (_g_file_attribute_matcher_matches_id (attribute_matcher,
G_FILE_ATTRIBUTE_ID_STANDARD_IS_HIDDEN)) G_FILE_ATTRIBUTE_ID_STANDARD_IS_HIDDEN))
@ -2046,7 +2041,9 @@ _g_local_file_info_get (const char *basename,
g_file_info_set_is_hidden (info, g_file_info_set_is_hidden (info,
(basename != NULL && (basename != NULL &&
(basename[0] == '.' || (basename[0] == '.' ||
file_is_hidden (path, basename)))); file_is_hidden (path, basename) ||
(stat_ok &&
_g_local_file_is_lost_found_dir (path, _g_stat_dev (&statbuf))))));
} }
_g_file_info_set_attribute_boolean_by_id (info, _g_file_info_set_attribute_boolean_by_id (info,