Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from HEAD:

Browse Source 
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
	crash when finalizing an unused GtkTextChildAnchor.  (#132260,
	muppet)
This commit is contained in:
Matthias Clasen
2004-01-31 22:57:17 +00:00
parent 17c3a6e32b
commit 7dbcae49d4
6 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -2,6 +2,10 @@ Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
crash when finalizing an unused GtkTextChildAnchor. (#132260,
muppet)
* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
the documentation for new_order. (#124790, Tim-Philipp Müller)

4
ChangeLog.pre-2-10
View File

@@ -2,6 +2,10 @@ Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
crash when finalizing an unused GtkTextChildAnchor. (#132260,
muppet)
* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
the documentation for new_order. (#124790, Tim-Philipp Müller)

4
ChangeLog.pre-2-4
View File

@@ -2,6 +2,10 @@ Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
crash when finalizing an unused GtkTextChildAnchor. (#132260,
muppet)
* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
the documentation for new_order. (#124790, Tim-Philipp Müller)

4
ChangeLog.pre-2-6
View File

@@ -2,6 +2,10 @@ Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
crash when finalizing an unused GtkTextChildAnchor. (#132260,
muppet)
* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
the documentation for new_order. (#124790, Tim-Philipp Müller)

4
ChangeLog.pre-2-8
View File

@@ -2,6 +2,10 @@ Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
Merge from HEAD:
* gtk/gtktextchild.c (gtk_text_child_anchor_finalize): Don't
crash when finalizing an unused GtkTextChildAnchor. (#132260,
muppet)
* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
the documentation for new_order. (#124790, Tim-Philipp Müller)

33
gtk/gtktextchild.c
View File

@@ -377,24 +377,27 @@ gtk_text_child_anchor_finalize (GObject *obj)
seg = anchor->segment;
if (seg->body.child.tree != NULL)
if (seg)
{
g_warning ("Someone removed a reference to a GtkTextChildAnchor "
"they didn't own; the anchor is still in the text buffer "
"and the refcount is 0.");
return;
}
if (seg->body.child.tree != NULL)
{
g_warning ("Someone removed a reference to a GtkTextChildAnchor "
"they didn't own; the anchor is still in the text buffer "
"and the refcount is 0.");
return;
}
tmp_list = seg->body.child.widgets;
while (tmp_list)
{
g_object_unref (tmp_list->data);
tmp_list = g_slist_next (tmp_list);
tmp_list = seg->body.child.widgets;
while (tmp_list)
{
g_object_unref (tmp_list->data);
tmp_list = g_slist_next (tmp_list);
}
g_slist_free (seg->body.child.widgets);
g_free (seg);
}
g_slist_free (seg->body.child.widgets);
g_free (seg);
anchor->segment = NULL;
}