applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

users-panel, cc-awatar-chooser: Don't request a symlink target for a file info when

Browse source 
it is not a symlink.

That previously caused a debug message, but will cause a g_critical.
Fixes #2547
This commit is contained in:
Lukáš Tyrychtr 2023-06-29 14:32:35 +02:00 • committed by Felipe Borges
parent a25697c2bc
commit 701f7c6cf6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
panels/user-accounts/cc-avatar-chooser.c
View file

@ -277,13 +277,9 @@ get_system_facesdirs (void)
static gboolean
add_faces_from_dirs (GListStore *faces, GStrv facesdirs, gboolean add_all)
{
GFile *file;
GFileType type;
const gchar *target;
guint i;
gboolean added_faces = FALSE;
for (i = 0; facesdirs[i] != NULL; i++) {
for (guint i = 0; facesdirs[i] != NULL; i++) {
g_autoptr(GFile) dir = NULL;
g_autoptr(GFileEnumerator) enumerator = NULL;
@ -301,6 +297,9 @@ add_faces_from_dirs (GListStore *faces, GStrv facesdirs, gboolean add_all)
}
while (TRUE) {
GFile *file;
GFileType type;
const gchar *target;
g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
if (info == NULL) {
break;
@ -312,7 +311,8 @@ add_faces_from_dirs (GListStore *faces, GStrv facesdirs, gboolean add_all)
continue;
}
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 != NULL && g_str_has_prefix (target , "legacy/")) {
continue;
}