forked from AuroraMiddleware/gtk
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
This commit is contained in:
parent
ab9f1d7bbc
commit
ca15f74ad2
@ -1,3 +1,12 @@
|
||||
2008-10-26 Christian Persch <chpe@gnome.org>
|
||||
|
||||
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 <philip@tecnocode.co.uk>
|
||||
|
||||
Bug 530454 – Clarify page_nr when printing
|
||||
|
@ -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");
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user