diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-11-13 12:12:52 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-11-16 08:44:36 -0500 |
| commit | 4ffdf917bbdfd4feee2d01c44a04ac47efc6429d (patch) | |
| tree | 53bb8b2042e0e6477fabef906f9e3764bdbbf6c3 | |
| parent | e3f84e9bf447655e804b34079d8a2764456c5f87 (diff) | |
| download | gtk+-4ffdf917bbdfd4feee2d01c44a04ac47efc6429d.tar.gz | |
icontheme: Add a trailing / when enumerating resources
This avoids extra string copies in GResource.
| -rw-r--r-- | gtk/gtkicontheme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index acd13e0eed..3225567fb9 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3398,7 +3398,9 @@ theme_subdir_load (GtkIconTheme *icon_theme, { for (d = icon_theme->priv->resource_paths; d; d = d->next) { - full_dir = g_build_filename ((const gchar *)d->data, subdir, NULL); + /* Force a trailing / here, to avoid extra copies in GResource */ + full_dir = g_build_filename ((const gchar *)d->data, subdir, " ", NULL); + full_dir[strlen (full_dir) - 1] = '\0'; dir = g_new0 (IconThemeDir, 1); dir->type = type; dir->is_resource = TRUE; |