summaryrefslogtreecommitdiff
path: root/gtk/gtkcellrendererpixbuf.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-10-26 20:37:17 +0000
committerChristian Persch <chpe@src.gnome.org>2008-10-26 20:37:17 +0000
commitca15f74ad2eceba1a9010971510486eae01d07f6 (patch)
tree852c879c55690cbcc661da1d814fcd2092251cee /gtk/gtkcellrendererpixbuf.c
parentab9f1d7bbcb867d15494c2d763de94559edc0b6b (diff)
downloadgtk+-ca15f74ad2eceba1a9010971510486eae01d07f6.tar.gz
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. svn path=/trunk/; revision=21715
Diffstat (limited to 'gtk/gtkcellrendererpixbuf.c')
-rw-r--r--gtk/gtkcellrendererpixbuf.c18
1 files changed, 3 insertions, 15 deletions
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");
}