Commit e8648181 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

remove some debug code that seems to have caused a breakpoint in valid

2001-09-07  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
	debug code that seems to have caused a breakpoint in valid cases

	* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
	pointer on the first view when adding the second view, fixes
	crash when closing gtk-demo text test with active selection

	* gtk/gtktextbuffer.c
	(gtk_text_buffer_remove_selection_clipboard): don't leave dead
	clipboards in the list of clipboards - probably fixes #59836
parent 1bbf2ac7
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
2001-09-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
debug code that seems to have caused a breakpoint in valid cases
* gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
pointer on the first view when adding the second view, fixes
crash when closing gtk-demo text test with active selection
* gtk/gtktextbuffer.c
(gtk_text_buffer_remove_selection_clipboard): don't leave dead
clipboards in the list of clipboards - probably fixes #59836
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
......
......@@ -1395,6 +1395,12 @@ _gtk_text_btree_add_view (GtkTextBTree *tree,
view->next = tree->views;
view->prev = NULL;
if (tree->views)
{
g_assert (tree->views->prev == NULL);
tree->views->prev = view;
}
tree->views = view;
/* The last line in the buffer has identity values for the per-view
......@@ -1453,6 +1459,9 @@ _gtk_text_btree_remove_view (GtkTextBTree *tree,
gtk_text_btree_node_remove_view (view, tree->root_node, view_id);
view->layout = (gpointer) 0xdeadbeef;
view->view_id = (gpointer) 0xdeadbeef;
g_free (view);
}
......@@ -3276,7 +3285,7 @@ _gtk_text_line_remove_data (GtkTextLine *line,
gpointer
_gtk_text_line_get_data (GtkTextLine *line,
gpointer view_id)
gpointer view_id)
{
GtkTextLineData *iter;
......
......@@ -3069,6 +3069,9 @@ gtk_text_buffer_remove_selection_clipboard (GtkTextBuffer *buffer,
{
if (gtk_clipboard_get_owner (selection_clipboard->clipboard) == G_OBJECT (buffer))
gtk_clipboard_clear (selection_clipboard->clipboard);
buffer->selection_clipboards = g_slist_remove (buffer->selection_clipboards,
selection_clipboard);
g_free (selection_clipboard);
}
......
......@@ -586,12 +586,6 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
_gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
NULL);
{
GtkTextLineData *ld = _gtk_text_line_get_data (last_btree_line, layout);
if (ld->height == 0)
G_BREAKPOINT ();
}
g_assert (last_btree_line != NULL);
line = first_btree_line;
......
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