Commit 03646f37 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Silently ignore info being NULL. This is unavoidable with the current

2004-10-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes):
	Silently ignore info being NULL. This is unavoidable with the
	current design where we have every implementation of layout_clear
	call layout_clear_attributes, and also delegate calls to dependent
	cell layouts.  (#154191, Martyn Russell)
parent c1bdbb3e
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes):
Silently ignore info being NULL. This is unavoidable with the
current design where we have every implementation of layout_clear
call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell)
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut
......
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes):
Silently ignore info being NULL. This is unavoidable with the
current design where we have every implementation of layout_clear
call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell)
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut
......
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes):
Silently ignore info being NULL. This is unavoidable with the
current design where we have every implementation of layout_clear
call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell)
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut
......
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes):
Silently ignore info being NULL. This is unavoidable with the
current design where we have every implementation of layout_clear
call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell)
2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut
......
......@@ -706,17 +706,18 @@ gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout,
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
info = gtk_cell_view_get_cell_info (cellview, renderer);
g_return_if_fail (info != NULL);
list = info->attributes;
while (list && list->next)
if (info != NULL)
{
g_free (list->data);
list = list->next->next;
list = info->attributes;
while (list && list->next)
{
g_free (list->data);
list = list->next->next;
}
g_slist_free (info->attributes);
info->attributes = NULL;
}
g_slist_free (info->attributes);
info->attributes = NULL;
}
static void
......
......@@ -764,7 +764,8 @@ gtk_tree_view_column_cell_layout_clear_attributes (GtkCellLayout *cell_layout
column = GTK_TREE_VIEW_COLUMN (cell_layout);
info = gtk_tree_view_column_get_cell_info (column, cell_renderer);
gtk_tree_view_column_clear_attributes_by_info (column, info);
if (info)
gtk_tree_view_column_clear_attributes_by_info (column, info);
}
static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment