summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-08-29 10:50:01 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-08-29 10:50:01 -0400
commit1090eba9a8b5c42bba5483f48fec4834b5b62a66 (patch)
tree3c90a0299df49273eacb17b05dd2dd58820c7bad
parent006d46362c9928ab70f2dcba63c6e5f2160bfb85 (diff)
downloadgtk+-1090eba9a8b5c42bba5483f48fec4834b5b62a66.tar.gz
a11y: don't return random numbers
Return 0 for the image size if we don't have a pixbuf to measure.
-rw-r--r--gtk/a11y/gtkimagecellaccessible.c3
-rw-r--r--gtk/gtkiconview.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c
index 4b356602e0..1db1470833 100644
--- a/gtk/a11y/gtkimagecellaccessible.c
+++ b/gtk/a11y/gtkimagecellaccessible.c
@@ -129,6 +129,9 @@ gtk_image_cell_accessible_get_image_size (AtkImage *image,
GtkCellRenderer *cell_renderer;
GdkPixbuf *pixbuf = NULL;
+ *width = 0;
+ *height = 0;
+
cell_renderer = GTK_RENDERER_CELL_ACCESSIBLE (cell)->renderer;
g_object_get (GTK_CELL_RENDERER_PIXBUF (cell_renderer),
"pixbuf", &pixbuf,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 6214706270..a252e0f745 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -7316,6 +7316,9 @@ gtk_icon_view_item_accessible_get_image_size (AtkImage *image,
if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
return;
+ *width = 0;
+ *height = 0;
+
if (get_pixbuf_box (GTK_ICON_VIEW (item->widget), item->item, &box))
{
*width = box.width;