AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
icontheme: Keep dir_mtimes in order

Closes #1115

See merge request GNOME/gtk!161
This commit is contained in:
Matthias Clasen 2018-05-27 15:50:17 +00:00
commit f9875040c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkicontheme.c
View File

@ -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)
{