From 191796f16c836b854ea79cea1e4f68844aff67b1 Mon Sep 17 00:00:00 2001 From: Tony Houghton Date: Mon, 10 Sep 2007 21:06:42 +0100 Subject: [PATCH] Simplified GError handling in theme_load_icon(). --- ROX-Filer/src/type.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/ROX-Filer/src/type.c b/ROX-Filer/src/type.c index ba0a0da9..cd18a313 100644 --- a/ROX-Filer/src/type.c +++ b/ROX-Filer/src/type.c @@ -1461,34 +1461,21 @@ GtkIconInfo *theme_lookup_icon(const gchar *icon_name, gint size, GdkPixbuf *theme_load_icon(const gchar *icon_name, gint size, GtkIconLookupFlags flags, GError **perror) { - GError *err = NULL; GdkPixbuf *result = gtk_icon_theme_load_icon(icon_theme, - icon_name, size, flags, &err); + icon_name, size, flags, NULL); if (!result && icon_theme != gnome_theme) { - if (err) - { - g_error_free(err); - err = NULL; - } init_gnome_theme(); result = gtk_icon_theme_load_icon(gnome_theme, - icon_name, size, flags, &err); + icon_name, size, flags, NULL); } if (!result && icon_theme != rox_theme) { - if (err) - { - g_error_free(err); - err = NULL; - } init_rox_theme(); result = gtk_icon_theme_load_icon(rox_theme, - icon_name, size, flags, &err); + icon_name, size, flags, perror); } - if (perror) - *perror = err; return result; } -- 2.11.4.GIT