diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-27 16:15:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-27 16:15:48 +0000 |
| commit | c5e6a170de3930738207f6fa3f8a5c53236e0ed2 (patch) | |
| tree | 5f599bedc880e12ad8e72028131c073cbf8e9081 | |
| parent | 63c5610d89aa6e72dd4d83a3fc18d264cf51f1e1 (diff) | |
| download | gdk-pixbuf-c5e6a170de3930738207f6fa3f8a5c53236e0ed2.tar.gz | |
Set page->last_focus_child to NULL as well as removing the weak reference,
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
page->last_focus_child to NULL as well as removing the
weak reference, to deal with reentrancy in set_focus_child().
(#76634)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 5 |
7 files changed, 46 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 324ccd9f2..7ac89a822 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 324ccd9f2..7ac89a822 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 324ccd9f2..7ac89a822 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 324ccd9f2..7ac89a822 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 324ccd9f2..7ac89a822 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtknotebook.c (gtk_notebook_real_remove): Set + page->last_focus_child to NULL as well as removing the + weak reference, to deal with reentrancy in set_focus_child(). + (#76634) + 2002-03-27 Murray Cumming <murrayc@usa.net> * gtk/gtktreeview.c: Corrected registered return type of diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e5361afc3..bce6cad25 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2389,7 +2389,10 @@ gtk_notebook_real_remove (GtkNotebook *notebook, page = list->data; if (page->last_focus_child) - g_object_remove_weak_pointer (G_OBJECT (page->last_focus_child), (gpointer *)&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)) need_resize = TRUE; |