From c5ed51a188b460111a0e3a0f27533f4ec729e9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Thu, 29 Aug 2019 16:40:41 +0200 Subject: [PATCH] icontheme: Remove outdated comment It's not called css_fg anymore and it can't possibly be NULL since we make sure before passing it here. --- gtk/gtkicontheme.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index de1bb94646..1cb73635e0 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -4244,12 +4244,12 @@ gtk_icon_info_load_symbolic_svg (GtkIconInfo *icon_info, static GdkPixbuf * gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, - const GdkRGBA *fg, - const GdkRGBA *success_color, - const GdkRGBA *warning_color, - const GdkRGBA *error_color, - gboolean use_cache, - GError **error) + const GdkRGBA *fg, + const GdkRGBA *success_color, + const GdkRGBA *warning_color, + const GdkRGBA *error_color, + gboolean use_cache, + GError **error) { GdkPixbuf *pixbuf; SymbolicPixbufCache *symbolic_cache; @@ -4258,16 +4258,11 @@ gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, if (use_cache) { symbolic_cache = symbolic_pixbuf_cache_matches (icon_info->symbolic_pixbuf_cache, - fg, success_color, warning_color, error_color); + fg, success_color, warning_color, error_color); if (symbolic_cache) - return symbolic_cache_get_proxy (symbolic_cache, icon_info); + return symbolic_cache_get_proxy (symbolic_cache, icon_info); } - /* css_fg can't possibly have failed, otherwise - * that would mean we have a broken style - */ - g_return_val_if_fail (fg != NULL, NULL); - icon_uri = g_file_get_uri (icon_info->icon_file); if (g_str_has_suffix (icon_uri, ".symbolic.png")) pixbuf = gtk_icon_info_load_symbolic_png (icon_info, fg, success_color, warning_color, error_color, error);