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

user-accounts: Use GIO API for face images handling

Browse source 
GFile is needed for face widgets anyway, so let's use GFileEnumerator
for dir listing instead of POSIX API.

https://gitlab.gnome.org/GNOME/gnome-control-center/issues/5
This commit is contained in:
Ondrej Holy 2018-02-26 17:07:23 +01:00
parent b127cb0301
commit 7bc7aa6e59
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
panels/user-accounts/um-photo-dialog.c
View file

@ -373,11 +373,11 @@ create_face_widget (gpointer item,
static void static void
setup_photo_popup (UmPhotoDialog *um) setup_photo_popup (UmPhotoDialog *um)
{ {
GFile *face_file; GFile *file, *dir;
GFileInfo *info;
GFileEnumerator *enumerator;
const gchar * const * dirs; const gchar * const * dirs;
guint i; guint i;
GDir *dir;
const char *face;
gboolean added_faces; gboolean added_faces;
um->faces = g_list_store_new (G_TYPE_FILE); um->faces = g_list_store_new (G_TYPE_FILE);
@ -395,25 +395,34 @@ setup_photo_popup (UmPhotoDialog *um)
char *path; char *path;
path = g_build_filename (dirs[i], "pixmaps", "faces", NULL); path = g_build_filename (dirs[i], "pixmaps", "faces", NULL);
dir = g_dir_open (path, 0, NULL); dir = g_file_new_for_path (path);
if (dir == NULL) {
g_free (path); g_free (path);
enumerator = g_file_enumerate_children (dir,
G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STANDARD_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK ","
G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
G_FILE_QUERY_INFO_NONE,
NULL, NULL);
if (enumerator == NULL) {
g_object_unref (dir);
continue; continue;
} }
while ((face = g_dir_read_name (dir)) != NULL) { while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) {
char *filename;
added_faces = TRUE; added_faces = TRUE;
filename = g_build_filename (path, face, NULL);
face_file = g_file_new_for_path (filename);
g_free (filename);
g_list_store_append (um->faces, face_file); file = g_file_get_child (dir, g_file_info_get_name (info));
g_list_store_append (um->faces, file);
g_object_unref (info);
} }
g_dir_close (dir);
g_free (path); g_file_enumerator_close (enumerator, NULL, NULL);
g_object_unref (enumerator);
g_object_unref (dir);
if (added_faces) if (added_faces)
break; break;