callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

relocate the remove_weak_pointer to just before we free the page, to be

Browse Source 
2002-04-12  Havoc Pennington  <hp@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
	remove_weak_pointer to just before we free the page, to be sure
	it doesn't get re-added. #75282
This commit is contained in:
Havoc Pennington
2002-04-12 21:52:16 +00:00
committed by Havoc Pennington
parent 8e84c6b9d2
commit c652859042
7 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2002-04-12 Havoc Pennington <hp@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): relocate the
remove_weak_pointer to just before we free the page, to be sure
it doesn't get re-added. #75282
Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org> Fri Apr 12 18:32:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add * gtk/gtktreeview.c (gtk_tree_view_real_set_cursor): add

13
gtk/gtknotebook.c
View File

@ -2387,12 +2387,6 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
gtk_notebook_switch_focus_tab (notebook, next_list); gtk_notebook_switch_focus_tab (notebook, next_list);
page = list->data; page = list->data;
if (page->last_focus_child)
{
g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&page->last_focus_child);
page->last_focus_child = NULL;
}
if (GTK_WIDGET_VISIBLE (page->child) && GTK_WIDGET_VISIBLE (notebook)) if (GTK_WIDGET_VISIBLE (page->child) && GTK_WIDGET_VISIBLE (notebook))
need_resize = TRUE; need_resize = TRUE;
@ -2412,6 +2406,13 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
notebook->children = g_list_remove_link (notebook->children, list); notebook->children = g_list_remove_link (notebook->children, list);
g_list_free (list); g_list_free (list);
if (page->last_focus_child)
{
g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&page->last_focus_child);
page->last_focus_child = NULL;
}
g_free (page); g_free (page);
if (!notebook->children && notebook->show_tabs && if (!notebook->children && notebook->show_tabs &&