Unset the acceleratable_groups qdata because qdata isn't removed on

Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset
        the acceleratable_groups qdata because qdata isn't removed
        on ->dispose but rather on ->finalize. (#74569, found
        by Matt Wilson.)

diff --git a/ChangeLog b/ChangeLog
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bdcf4a982c1e43f6804280a9cc7b9a0214f9c4c4..e5cf63ce1e443819466443587989333e53097b1f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Mar 13 17:11:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkaccelgroup.c (accel_group_weak_ref_detach): Unset 
+       the acceleratable_groups qdata because qdata isn't removed
+       on ->dispose but rather on ->finalize. (#74569, found
+       by Matt Wilson.)
+
 Tue Mar 12 23:14:23 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index e244fdb9c7038d010168b7ff8c8c2e4bab99bf5e..0cfa9e685cb410b491b10e741b59680a733e4e07 100644 (file)
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -190,6 +190,7 @@ accel_group_weak_ref_detach (GSList  *free_list,
       g_object_unref (accel_group);
     }
   g_slist_free (free_list);
+  g_object_set_qdata (stale_object, quark_acceleratable_groups, NULL);
 }
 
 void