From 3028d478b8450e8f6187b275aecec51850355652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 5 Jul 2023 21:20:36 +0200 Subject: [PATCH] st/icon-theme: Remove special-casing of symbolic lookup GThemedIcon considers the "-symbolic" suffix when generating fallback names (i.e. "foo-bar-symbolic", "foo-symbolic", "foo-bar", "foo"). That means now that we prefer more accurate name matches from any theme over fallback matches from higher-priority themes, we no longer need to special-case symbolic names for preferring symbolic matches over full-color fallbacks. Part-of: --- src/st/st-icon-theme.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c index 4b04264eb..432afdce4 100644 --- a/src/st/st-icon-theme.c +++ b/src/st/st-icon-theme.c @@ -1293,28 +1293,6 @@ real_choose_icon (StIconTheme *icon_theme, else allow_svg = icon_theme->pixbuf_supports_svg; - /* For symbolic icons, do a search in all registered themes first; - * a theme that inherits them from a parent theme might provide - * an alternative full-color version, but still expect the symbolic icon - * to show up instead. - * - * In other words: We prefer symbolic icons in inherited themes over - * generic icons in the theme. - */ - for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i]); i++) - { - icon_name = icon_names[i]; - - for (l = icon_theme->themes; l; l = l->next) - { - theme = l->data; - - icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg); - if (icon_info) - goto out; - } - } - for (i = 0; icon_names[i]; i++) { icon_name = icon_names[i];