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

icontheme: Remove use_builtin parameter from theme_lookup_icon

Browse Source 
Unused.
This commit is contained in:
Timm Bäder 2019-05-21 14:53:03 +02:00
parent 44352b375e
commit fa85f4fc2e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkicontheme.c
View File

@ -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;