[gtk/ebassi/reproducible-icon-cache] updateiconcache: Sort list of entries
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ebassi/reproducible-icon-cache] updateiconcache: Sort list of entries
- Date: Sat, 13 Mar 2021 15:12:46 +0000 (UTC)
commit 850768270f86f060ad317933b629593f6fdd08be
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Date: Wed Aug 15 03:11:21 2018 +0200
updateiconcache: Sort list of entries
because filesystem readdir order is indeterministic.
Without this patch, building openSUSE's balsa package
had variations between builds in /usr/share/balsa/icon-theme.cache
(cherry picked from commit b364827a5b99e3b02862f36be4c03826e72aefba)
Signed-off-by: Emmanuele Bassi <ebassi gnome org>
gtk/updateiconcache.c | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index b48eaca804..6703c8b9e8 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]