From fa85f4fc2e13bc4ff742cd9f4013437b5ac450b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 21 May 2019 14:53:03 +0200 Subject: [PATCH] icontheme: Remove use_builtin parameter from theme_lookup_icon Unused. --- gtk/gtkicontheme.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index fb983c043d..78714d7c01 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -325,8 +325,7 @@ static GtkIconInfo *theme_lookup_icon (IconTheme *theme, const gchar *icon_name, gint size, gint scale, - gboolean allow_svg, - gboolean use_default_icons); + gboolean allow_svg); static void theme_list_icons (IconTheme *theme, GHashTable *icons, GQuark context); @@ -1662,7 +1661,6 @@ real_choose_icon (GtkIconTheme *icon_theme, UnthemedIcon *unthemed_icon = NULL; const gchar *icon_name = NULL; gboolean allow_svg; - gboolean use_builtin; IconTheme *theme = NULL; gint i; IconInfoKey key; @@ -1698,8 +1696,6 @@ real_choose_icon (GtkIconTheme *icon_theme, else allow_svg = priv->pixbuf_supports_svg; - use_builtin = flags & GTK_ICON_LOOKUP_USE_BUILTIN; - /* This is used in the icontheme unit test */ GTK_DISPLAY_NOTE (priv->display, ICONTHEME, for (i = 0; icon_names[i]; i++) @@ -1719,7 +1715,7 @@ real_choose_icon (GtkIconTheme *icon_theme, for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i], -1); i++) { icon_name = icon_names[i]; - icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg, use_builtin); + icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg); if (icon_info) goto out; } @@ -1732,7 +1728,7 @@ real_choose_icon (GtkIconTheme *icon_theme, for (i = 0; icon_names[i]; i++) { icon_name = icon_names[i]; - icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg, use_builtin); + icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg); if (icon_info) goto out; } @@ -1826,7 +1822,7 @@ real_choose_icon (GtkIconTheme *icon_theme, icon_info->unscaled_scale = 1.0; if (scale != 1 && !icon_info->forced_size && theme != NULL) { - unscaled_icon_info = theme_lookup_icon (theme, icon_name, size, 1, allow_svg, use_builtin); + unscaled_icon_info = theme_lookup_icon (theme, icon_name, size, 1, allow_svg); if (unscaled_icon_info) { icon_info->unscaled_scale = @@ -2916,8 +2912,7 @@ theme_lookup_icon (IconTheme *theme, const gchar *icon_name, gint size, gint scale, - gboolean allow_svg, - gboolean use_builtin) + gboolean allow_svg) { GList *dirs, *l; IconThemeDir *dir, *min_dir;