summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-05-23 20:06:01 +0200
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-05-23 20:06:01 +0200
commit1e06838c1c15ad2197168f24b88da5ef11817ffd (patch)
tree1b15e7fe03089ca4eab63f0920db9ca225ccd415
parent4bb3ac3e814e3808a0525219c89531fac370e640 (diff)
downloadgtk+-1e06838c1c15ad2197168f24b88da5ef11817ffd.tar.gz
icontheme: Keep dir_mtimes in order
Don't reverse the order each time we insert a theme. Reverse it only once, after all themes have been loaded. Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1115
-rw-r--r--gtk/gtkicontheme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 0faca7d72c..33ef8542a9 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1091,7 +1091,6 @@ insert_theme (GtkIconTheme *icon_theme,
priv->dir_mtimes = g_list_prepend (priv->dir_mtimes, dir_mtime);
}
- priv->dir_mtimes = g_list_reverse (priv->dir_mtimes);
theme_file = NULL;
for (i = 0; i < priv->search_path_len && !theme_file; i++)
@@ -1316,7 +1315,7 @@ load_themes (GtkIconTheme *icon_theme)
dir = icon_theme->priv->search_path[base];
dir_mtime = g_slice_new (IconThemeDirMtime);
- priv->dir_mtimes = g_list_append (priv->dir_mtimes, dir_mtime);
+ priv->dir_mtimes = g_list_prepend (priv->dir_mtimes, dir_mtime);
dir_mtime->dir = g_strdup (dir);
dir_mtime->mtime = 0;
@@ -1341,6 +1340,7 @@ load_themes (GtkIconTheme *icon_theme)
g_dir_close (gdir);
}
+ priv->dir_mtimes = g_list_reverse (priv->dir_mtimes);
for (d = priv->resource_paths; d; d = d->next)
{