From: Timm Bäder <mail@baedert.org>
Date: Sun, 1 Sep 2019 08:56:29 +0000 (+0200)
Subject: icontheme: Remove icon_info_load_pixbuf
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~885
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1873b38a949937c9afc5dea719c63714d9e534a9;p=gtk4.git

icontheme: Remove icon_info_load_pixbuf

What it does overlaps with the only caller a lot now.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 16038d1bb1..89fb9a7a0e 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3640,34 +3640,6 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info)
   return TRUE;
 }
 
-static GdkPixbuf *
-icon_info_load_pixbuf (GtkIconInfo  *icon_info,
-                       GError      **error)
-{
-  if (!icon_info_ensure_scale_and_pixbuf (icon_info))
-    {
-      if (icon_info->load_error)
-        {
-          if (error)
-            *error = g_error_copy (icon_info->load_error);
-        }
-      else
-        {
-          g_set_error_literal (error,
-                               GTK_ICON_THEME_ERROR,
-                               GTK_ICON_THEME_NOT_FOUND,
-                               _("Failed to load icon"));
-        }
-
-      return NULL;
-    }
-
-  if (icon_info->pixbuf != NULL)
-    return g_object_ref (icon_info->pixbuf);
-
-  return NULL;
-}
-
 /**
  * gtk_icon_info_load_icon:
  * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
@@ -3700,7 +3672,10 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
     {
       GdkPixbuf *pixbuf;
 
-      pixbuf = icon_info_load_pixbuf (icon_info, NULL);
+      icon_info_ensure_scale_and_pixbuf (icon_info);
+
+      if (icon_info->pixbuf)
+        pixbuf = g_object_ref (icon_info->pixbuf);
 
       if (!pixbuf)
         {