forked from AuroraMiddleware/gtk
Actually free the lists. Pointed out by Morten Welinder.
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtktextbtree.c (_gtk_text_btree_check): * gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes): * gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): Actually free the lists. Pointed out by Morten Welinder.
This commit is contained in:
parent
e77b5747b2
commit
738eeba8d6
@ -1,5 +1,6 @@
|
||||
Fri Feb 6 22:56:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* gtk/gtktextbtree.c (_gtk_text_btree_check):
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes):
|
||||
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
|
||||
Actually free the lists. Pointed out by Morten Welinder.
|
||||
|
@ -1,5 +1,6 @@
|
||||
Fri Feb 6 22:56:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* gtk/gtktextbtree.c (_gtk_text_btree_check):
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes):
|
||||
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
|
||||
Actually free the lists. Pointed out by Morten Welinder.
|
||||
|
@ -1,5 +1,6 @@
|
||||
Fri Feb 6 22:56:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* gtk/gtktextbtree.c (_gtk_text_btree_check):
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes):
|
||||
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
|
||||
Actually free the lists. Pointed out by Morten Welinder.
|
||||
|
@ -1,5 +1,6 @@
|
||||
Fri Feb 6 22:56:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* gtk/gtktextbtree.c (_gtk_text_btree_check):
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes):
|
||||
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
|
||||
Actually free the lists. Pointed out by Morten Welinder.
|
||||
|
@ -1,5 +1,6 @@
|
||||
Fri Feb 6 22:56:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||
Fri Feb 6 23:08:29 2004 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* gtk/gtktextbtree.c (_gtk_text_btree_check):
|
||||
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_clear_attributes):
|
||||
* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes):
|
||||
Actually free the lists. Pointed out by Morten Welinder.
|
||||
|
@ -682,7 +682,6 @@ gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout,
|
||||
{
|
||||
GtkCellViewCellInfo *info;
|
||||
GtkCellView *cellview = GTK_CELL_VIEW (layout);
|
||||
GSList *list;
|
||||
|
||||
g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
|
||||
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
|
||||
@ -690,15 +689,8 @@ gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout *layout,
|
||||
info = gtk_cell_view_get_cell_info (cellview, renderer);
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
list = info->attributes;
|
||||
|
||||
while (list && list->next)
|
||||
{
|
||||
g_free (list->data);
|
||||
list = list->next->next;
|
||||
}
|
||||
g_slist_free (list);
|
||||
|
||||
g_slist_foreach (info->attributes, (GFunc)g_free, NULL);
|
||||
g_slist_free (info->attributes);
|
||||
info->attributes = NULL;
|
||||
}
|
||||
|
||||
|
@ -2258,7 +2258,6 @@ gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout,
|
||||
ComboCellInfo *info;
|
||||
GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
|
||||
GtkWidget *menu;
|
||||
GSList *list;
|
||||
|
||||
g_return_if_fail (GTK_IS_COMBO_BOX (layout));
|
||||
g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
|
||||
@ -2266,14 +2265,8 @@ gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout *layout,
|
||||
info = gtk_combo_box_get_cell_info (combo_box, cell);
|
||||
g_return_if_fail (info != NULL);
|
||||
|
||||
list = info->attributes;
|
||||
while (list && list->next)
|
||||
{
|
||||
g_free (list->data);
|
||||
list = list->next->next;
|
||||
}
|
||||
g_slist_free (list);
|
||||
|
||||
g_slist_foreach (info->attributes, (GFunc)g_free, NULL);
|
||||
g_slist_free (info->attributes);
|
||||
info->attributes = NULL;
|
||||
|
||||
if (combo_box->priv->cell_view)
|
||||
|
@ -6698,15 +6698,15 @@ _gtk_text_btree_check (GtkTextBTree *tree)
|
||||
GtkTextLine *line;
|
||||
GtkTextLineSegment *seg;
|
||||
GtkTextTag *tag;
|
||||
GSList *taglist = NULL;
|
||||
GSList *all_tags, *taglist = NULL;
|
||||
int count;
|
||||
GtkTextTagInfo *info;
|
||||
|
||||
/*
|
||||
* Make sure that the tag toggle counts and the tag root pointers are OK.
|
||||
*/
|
||||
for (taglist = list_of_tags (tree->table);
|
||||
taglist != NULL ; taglist = taglist->next)
|
||||
all_tags = list_of_tags (tree->table);
|
||||
for (taglist = all_tags; taglist != NULL ; taglist = taglist->next)
|
||||
{
|
||||
tag = taglist->data;
|
||||
info = gtk_text_btree_get_existing_tag_info (tree, tag);
|
||||
@ -6790,8 +6790,7 @@ _gtk_text_btree_check (GtkTextBTree *tree)
|
||||
}
|
||||
}
|
||||
|
||||
g_slist_free (taglist);
|
||||
taglist = NULL;
|
||||
g_slist_free (all_tags);
|
||||
|
||||
/*
|
||||
* Call a recursive procedure to do the main body of checks.
|
||||
|
Loading…
Reference in New Issue
Block a user