From ca15f74ad2eceba1a9010971510486eae01d07f6 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 26 Oct 2008 20:37:17 +0000 Subject: [PATCH] =?UTF-8?q?=09Bug=20557065=20=E2=80=93=20gtkcellrendererpi?= =?UTF-8?q?xbuf=20spams=20console=20over=20and=20over=20with=20=09'could?= =?UTF-8?q?=20not=20load=20image'=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtkcellrendererpixbuf.c: (gtk_cell_renderer_pixbuf_create_themed_pixbuf): Remove noisy g_warning. svn path=/trunk/; revision=21715 --- ChangeLog | 9 +++++++++ gtk/gtkcellrendererpixbuf.c | 18 +++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d7002b3a1..72644fb6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-26 Christian Persch + + Bug 557065 – gtkcellrendererpixbuf spams console over and over with + 'could not load image' warnings + + * gtk/gtkcellrendererpixbuf.c: + (gtk_cell_renderer_pixbuf_create_themed_pixbuf): Remove noisy + g_warning. + 2008-10-26 Philip Withnall Bug 530454 – Clarify page_nr when printing diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index a75a88f058..0431295e41 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -418,7 +418,6 @@ gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf GtkIconTheme *icon_theme; GtkSettings *settings; gint width, height; - GError *error = NULL; priv = GTK_CELL_RENDERER_PIXBUF_GET_PRIVATE (cellpixbuf); @@ -445,7 +444,7 @@ gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf priv->icon_name, MIN (width, height), GTK_ICON_LOOKUP_USE_BUILTIN, - &error); + NULL); else if (priv->gicon) { GtkIconInfo *info; @@ -454,24 +453,13 @@ gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf priv->gicon, MIN (width, height), GTK_ICON_LOOKUP_USE_BUILTIN); - if (!info) + if (info) { - g_set_error (&error, GTK_ICON_THEME_ERROR, GTK_ICON_THEME_NOT_FOUND, - _("Icon not present in theme")); - } - else - { - cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, &error); + cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, NULL); gtk_icon_info_free (info); } } - if (!cellpixbuf->pixbuf) - { - g_warning ("could not load image: %s\n", error->message); - g_error_free (error); - } - g_object_notify (G_OBJECT (cellpixbuf), "pixbuf"); }