mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-07 11:20:09 +00:00
Merge branch 'gtk-3-24' into 'gtk-3-24'
icontheme: Keep dir_mtimes in order See merge request GNOME/gtk!162
This commit is contained in:
commit
38b796d2c3
@ -1164,7 +1164,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++)
|
||||
@ -1389,7 +1388,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;
|
||||
@ -1414,6 +1413,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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user