From 1d4c37cd2d59073ec0faa2029e1cd3ffdaedc9da Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 13 Mar 2002 22:14:47 +0000 Subject: [PATCH] Unset the acceleratable_groups qdata because qdata isn't removed on Wed Mar 13 17:11:10 2002 Owen Taylor * 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.) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkaccelgroup.c | 1 + 8 files changed, 50 insertions(+) diff --git a/ChangeLog b/ChangeLog index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bdcf4a982c..e5cf63ce1e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Mar 13 17:11:10 2002 Owen Taylor + + * 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 * gtk/gtktreeselection.c (gtk_tree_selection_unselect_iter): Fix diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index e244fdb9c7..0cfa9e685c 100644 --- 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