Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ebassi/reproducible-icon-cache' into 'gtk-3-24'

Browse Source 
Reproducible icon cache

See merge request GNOME/gtk!3293
This commit is contained in:
Matthias Clasen
2021-03-13 18:07:01 +00:00
parent c7df3b9e97 850768270f
commit 5edac966e4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/updateiconcache.c
View File

@@ -600,6 +600,7 @@ scan_directory (const gchar *base_path,
{
GHashTable *dir_hash;
GDir *dir;
GList *list = NULL, *iterator = NULL;
const gchar *name;
gchar *dir_path;
gboolean dir_added = FALSE;
@@ -617,6 +618,13 @@ scan_directory (const gchar *base_path,
while ((name = g_dir_read_name (dir)))
{
list = g_list_prepend (list, g_strdup (name));
}
list = g_list_sort (list, (GCompareFunc) strcmp);
for (iterator = list; iterator; iterator = iterator->next)
{
name = iterator->data;
gchar *path;
gboolean retval;
int flags = 0;
@@ -695,6 +703,7 @@ scan_directory (const gchar *base_path,
g_free (path);
}
g_list_free_full (list, g_free);
g_dir_close (dir);
/* Move dir into the big file hash */