diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-05-27 15:50:17 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-05-27 15:50:17 +0000 |
| commit | f9875040c605755ad5df99266fc1d239c47e8761 (patch) | |
| tree | 7a520cd4d64c269ddab8c40b577b274bfaea6e23 | |
| parent | 7f9cd9f9d9fcd440ac48aede683255e9577a1f16 (diff) | |
| parent | 1e06838c1c15ad2197168f24b88da5ef11817ffd (diff) | |
| download | gtk+-f9875040c605755ad5df99266fc1d239c47e8761.tar.gz | |
Merge branch 'master' into 'master'
icontheme: Keep dir_mtimes in order
Closes #1115
See merge request GNOME/gtk!161
| -rw-r--r-- | gtk/gtkicontheme.c | 4 |
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) { |