Handle info being NULL better. (Coverity)

2006-04-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Handle info
	being NULL better.  (Coverity)
This commit is contained in:
Matthias Clasen
2006-04-11 18:44:15 +00:00
committed by Matthias Clasen
parent a2c37df9ee
commit b6347c107b
3 changed files with 9 additions and 1 deletions

View File

@@ -1,5 +1,8 @@
2006-04-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Handle info
being NULL better. (Coverity)
* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
compiler warnings.

View File

@@ -1,5 +1,8 @@
2006-04-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_cursor): Handle info
being NULL better. (Coverity)
* gtk/gtkscale.c (gtk_scale_get_layout_offsets): Silence
compiler warnings.

View File

@@ -1766,6 +1766,8 @@ gtk_icon_view_set_cursor (GtkIconView *icon_view,
info = NULL;
}
g_return_if_fail (cell == NULL || info != NULL);
gtk_icon_view_set_cursor_item (icon_view, item, cell_pos);
if (FALSE && GTK_WIDGET_REALIZED (icon_view))
gtk_icon_view_scroll_to_item (icon_view, item);
@@ -1773,7 +1775,7 @@ gtk_icon_view_set_cursor (GtkIconView *icon_view,
gtk_icon_view_scroll_to_path (icon_view, path,
FALSE, 0.0, 0.0);
if (start_editing)
if (info && start_editing)
gtk_icon_view_start_editing (icon_view, item, info, NULL);
}