[gtk/wip/baedert/icontheme: 12/18] icontheme: Remove use_builtin parameter from theme_lookup_icon



commit 28165f4e67e2f43dfc29f847dbb267d1a4e18959
Author: Timm Bäder <mail baedert org>
Date:   Tue May 21 14:53:03 2019 +0200

    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 6bce19d43a..c1cef836f7 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -290,8 +290,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);
@@ -1647,7 +1646,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;
@@ -1684,8 +1682,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; i < n_icon_names; i++)
@@ -1705,7 +1701,7 @@ real_choose_icon (GtkIconTheme       *icon_theme,
       for (i = 0; i < n_icon_names && 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;
         }
@@ -1718,7 +1714,7 @@ real_choose_icon (GtkIconTheme       *icon_theme,
       for (i = 0; i < n_icon_names; 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;
         }
@@ -1798,7 +1794,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 =
@@ -2912,8 +2908,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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]