summaryrefslogtreecommitdiff
path: root/gtk/gtkiconview.c
diff options
context:
space:
mode:
authorDenis Washington <denisw@online.de>2011-08-30 08:38:03 +0200
committerDenis Washington <denisw@online.de>2011-08-30 08:38:03 +0200
commitcea54613538ffaa0a2cf2326de1822f740de1361 (patch)
treec18de79055af8c6466ab882ac1f257c93c316311 /gtk/gtkiconview.c
parentc2107aebe708d44e04a34f9549c110a82cce5153 (diff)
parent143f943905fc75cb5888011b641e447ee5c75037 (diff)
downloadgtk+-gtkbuilder-gbinding-transform.tar.gz
Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transformgtkbuilder-gbinding-transform
Diffstat (limited to 'gtk/gtkiconview.c')
-rw-r--r--gtk/gtkiconview.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index fe8ccb326f..a252e0f745 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3692,7 +3692,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
gint count)
{
GtkIconViewItem *item;
- GtkCellRenderer *cell;
+ GtkCellRenderer *cell = NULL;
gboolean dirty = FALSE;
gint step;
GtkDirectionType direction;
@@ -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;