Always initialize out params

This was causing a crash in the appearance capplet, reported in
bug 596345.
This commit is contained in:
Matthias Clasen 2009-09-28 12:41:29 -04:00
parent 7d196b3939
commit 894e11e447

View File

@ -3469,6 +3469,9 @@ gtk_icon_view_get_item_at_coords (GtkIconView *icon_view,
GList *items, *l;
GdkRectangle box;
if (cell_at_pos)
*cell_at_pos = NULL;
for (items = icon_view->priv->items; items; items = items->next)
{
GtkIconViewItem *item = items->data;
@ -3483,12 +3486,12 @@ gtk_icon_view_get_item_at_coords (GtkIconView *icon_view,
for (l = icon_view->priv->cell_list; l; l = l->next)
{
GtkIconViewCellInfo *info = (GtkIconViewCellInfo *)l->data;
if (!info->cell->visible)
continue;
gtk_icon_view_get_cell_box (icon_view, item, info, &box);
if ((x >= box.x && x <= box.x + box.width &&
y >= box.y && y <= box.y + box.height) ||
(x >= box.x &&
@ -3498,14 +3501,11 @@ gtk_icon_view_get_item_at_coords (GtkIconView *icon_view,
{
if (cell_at_pos)
*cell_at_pos = info;
return item;
}
}
if (cell_at_pos)
*cell_at_pos = NULL;
if (only_in_cell)
return NULL;
}