[gtk: 7/31] Remove unnecessary image-missing fallbacks
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 7/31] Remove unnecessary image-missing fallbacks
- Date: Mon, 10 Feb 2020 12:47:21 +0000 (UTC)
commit 68657440340784dbd97e9064127474e0c9f2c3a6
Author: Alexander Larsson <alexl redhat com>
Date: Thu Feb 6 09:50:04 2020 +0100
Remove unnecessary image-missing fallbacks
We now always return something from icon theme lookups, so no need to
do custom fallbacks.
gtk/gtkcssimageicontheme.c | 7 -------
gtk/gtkiconhelper.c | 7 -------
2 files changed, 14 deletions(-)
---
diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c
index 4a3ea9ce1b..c886e2447c 100644
--- a/gtk/gtkcssimageicontheme.c
+++ b/gtk/gtkcssimageicontheme.c
@@ -68,13 +68,6 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
icon_theme->scale,
GTK_TEXT_DIR_NONE,
0);
- if (icon == NULL)
- icon = gtk_icon_theme_lookup_icon (icon_theme->icon_theme,
- "image-missing",
- NULL,
- size, icon_theme->scale,
- GTK_TEXT_DIR_NONE,
- 0);
g_assert (icon != NULL);
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index eb6f715527..82ea7add2e 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -105,13 +105,6 @@ ensure_paintable_for_gicon (GtkIconHelper *self,
MIN (width, height),
dir,
scale, flags);
- if (icon == NULL)
- icon = gtk_icon_theme_lookup_icon (icon_theme,
- "image-missing",
- NULL,
- width, scale,
- dir,
- flags);
*symbolic = gtk_icon_paintable_is_symbolic (icon);
return GDK_PAINTABLE (icon);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]