diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-02-26 17:42:51 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-02-26 17:55:50 +0100 |
| commit | 1953e6b8d1889a72fece436c350d7b3c19c218c6 (patch) | |
| tree | 1f75c94315a626a5d029c6e1170e1c1d1e84c225 | |
| parent | e8ef74452b32f4596b2c9232056d31275a79b683 (diff) | |
| download | gnome-control-center-wip/oholy/add-back-legacy-face-images.tar.gz | |
user-accounts: Do not show legacy face imageswip/oholy/add-back-legacy-face-images
Legacy face images should not be shown in avatar chooser, so let's filter
all symlinks to the legacy files out.
Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/5
| -rw-r--r-- | panels/user-accounts/um-photo-dialog.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/panels/user-accounts/um-photo-dialog.c b/panels/user-accounts/um-photo-dialog.c index 5dbe6653d..7072699ce 100644 --- a/panels/user-accounts/um-photo-dialog.c +++ b/panels/user-accounts/um-photo-dialog.c @@ -376,6 +376,8 @@ setup_photo_popup (UmPhotoDialog *um) GFile *file, *dir; GFileInfo *info; GFileEnumerator *enumerator; + GFileType type; + const gchar *target; const gchar * const * dirs; guint i; gboolean added_faces; @@ -413,6 +415,18 @@ setup_photo_popup (UmPhotoDialog *um) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) { added_faces = TRUE; + type = g_file_info_get_file_type (info); + if (type != G_FILE_TYPE_REGULAR && + type != G_FILE_TYPE_SYMBOLIC_LINK) { + g_object_unref (info); + continue; + } + + target = g_file_info_get_symlink_target (info); + if (target != NULL && g_str_has_prefix (target , "legacy/")) { + g_object_unref (info); + continue; + } file = g_file_get_child (dir, g_file_info_get_name (info)); g_list_store_append (um->faces, file); |