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)

diff --git a/ChangeLog b/ChangeLog
index 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- 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 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- 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 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- 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 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- 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 324ccd9f2e0e72c695ae4da7030e80e8c5789c8c..7ac89a822e72f54be21f9e8d87ebc2438c411427 100644 (file)
--- 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 e5361afc35bb86fb72896a342cecafeab6d018a2..bce6cad258b74d228fb78fcc9b37f2dc1c089e78 100644 (file)
--- 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;