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

fixed destroy handler, so it doesn't segfault with the new refcounting

Browse Source 
Mon Feb  2 04:15:08 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
          segfault with the new refcounting scheme anymore.

        * gtk/gtkhandlebox.c:
        * gtk/gtkclist.c:
        * gtk/gtkentry.c:
        * gtk/gtkrange.c:
        * gtk/gtktext.c:
        * gtk/gtkviewport.c:
          enforced
          gdk_window_set_user_data (window, NULL);
          gdk_window_destroy (window);
          window = NULL;
          throughout the code.
This commit is contained in:
Tim Janik
1998-02-02 20:40:03 +00:00
committed by Tim Janik
parent eeaefdf04f
commit 6b5e983f3d
14 changed files with 146 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-0
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-10
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-2
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-4
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-6
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

15
ChangeLog.pre-2-8
View File

@ -1,5 +1,20 @@
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtktoolbar.c: fixed destroy handler, so it doesn't
segfault with the new refcounting scheme anymore.
* gtk/gtkhandlebox.c:
* gtk/gtkclist.c:
* gtk/gtkentry.c:
* gtk/gtkrange.c:
* gtk/gtktext.c:
* gtk/gtkviewport.c:
enforced
gdk_window_set_user_data (window, NULL);
gdk_window_destroy (window);
window = NULL;
throughout the code.
* gtk/gtkmain.c (gtk_propagate_event): fixed a bad, bad referencing
bug that could caused unreferencing of finalized objects.

9
gtk/gtkclist.c
View File

@ -1572,18 +1572,21 @@ gtk_clist_unrealize (GtkWidget * widget)
for (i = 0; i < clist->columns; i++)
if (clist->column[i].window)
{
gdk_window_set_user_data (clist->column[i].window, NULL);
gdk_window_destroy (clist->column[i].window);
clist->column[i].window = NULL;
}
gdk_window_set_user_data (clist->clist_window, NULL);
gdk_window_destroy (clist->clist_window);
clist->clist_window = NULL;
gdk_window_set_user_data (clist->title_window, NULL);
gdk_window_destroy (clist->title_window);
clist->title_window = NULL;
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
clist->clist_window = NULL;
clist->title_window = NULL;
clist->cursor_drag = NULL;
clist->xor_gc = NULL;
clist->fg_gc = NULL;

6
gtk/gtkentry.c
View File

@ -690,16 +690,16 @@ gtk_entry_unrealize (GtkWidget *widget)
{
gdk_window_set_user_data (entry->text_area, NULL);
gdk_window_destroy (entry->text_area);
entry->text_area = NULL;
gdk_cursor_destroy (entry->cursor);
entry->cursor = NULL;
}
if (widget->window)
{
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
}
entry->text_area = NULL;
widget->window = NULL;
}
static void

18
gtk/gtkhandlebox.c
View File

@ -147,6 +147,7 @@ gtk_handle_box_destroy (GtkObject *object)
hb = GTK_HANDLE_BOX (object);
gdk_cursor_destroy (hb->fleur_cursor);
hb->fleur_cursor = NULL;
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
@ -264,15 +265,18 @@ gtk_handle_box_unrealize (GtkWidget *widget)
hb = GTK_HANDLE_BOX (widget);
if (widget->window)
gdk_window_destroy (widget->window);
{
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
}
if (hb->steady_window)
gdk_window_destroy (hb->steady_window);
hb->steady_window = NULL;
widget->window = NULL;
/* FIXME: do we have to unref the float_window before destroying it? */
{
gdk_window_set_user_data (hb->steady_window, NULL);
gdk_window_destroy (hb->steady_window);
hb->steady_window = NULL;
}
gtk_widget_destroy (hb->float_window);
hb->float_window = NULL;

11
gtk/gtkrange.c
View File

@ -652,33 +652,32 @@ gtk_range_unrealize (GtkWidget *widget)
{
gdk_window_set_user_data (range->slider, NULL);
gdk_window_destroy (range->slider);
range->slider = NULL;
}
if (range->trough)
{
gdk_window_set_user_data (range->trough, NULL);
gdk_window_destroy (range->trough);
range->trough = NULL;
}
if (range->step_forw)
{
gdk_window_set_user_data (range->step_forw, NULL);
gdk_window_destroy (range->step_forw);
range->step_forw = NULL;
}
if (range->step_back)
{
gdk_window_set_user_data (range->step_back, NULL);
gdk_window_destroy (range->step_back);
range->step_back = NULL;
}
if (widget->window)
{
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
}
range->slider = NULL;
range->trough = NULL;
range->step_forw = NULL;
range->step_back = NULL;
widget->window = NULL;
}
static gint

5
gtk/gtktext.c
View File

@ -706,12 +706,11 @@ gtk_text_unrealize (GtkWidget *widget)
gtk_style_detach (widget->style);
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
gdk_window_set_user_data (text->text_area, NULL);
gdk_window_destroy (text->text_area);
gdk_gc_destroy (text->gc);
widget->window = NULL;
text->text_area = NULL;
gdk_gc_destroy (text->gc);
text->gc = NULL;
}

18
gtk/gtktoolbar.c
View File

@ -182,7 +182,6 @@ gtk_toolbar_destroy (GtkObject *object)
{
GtkToolbar *toolbar;
GList *children;
GtkToolbarChild *child;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (object));
@ -190,23 +189,28 @@ gtk_toolbar_destroy (GtkObject *object)
toolbar = GTK_TOOLBAR (object);
gtk_object_unref (GTK_OBJECT (toolbar->tooltips));
toolbar->tooltips = NULL;
for (children = toolbar->children; children; children = children->next)
{
GtkToolbarChild *child;
child = children->data;
if (child->type != GTK_TOOLBAR_CHILD_SPACE)
{
child->widget->parent = NULL;
gtk_object_unref (GTK_OBJECT (child->widget));
gtk_widget_ref (child->widget);
gtk_widget_unparent (child->widget);
gtk_widget_destroy (child->widget);
gtk_widget_unref (child->widget);
}
g_free (child);
}
g_list_free (toolbar->children);
toolbar->children = NULL;
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@ -515,6 +519,9 @@ gtk_toolbar_remove (GtkContainer *container,
if ((child->type != GTK_TOOLBAR_CHILD_SPACE) && (child->widget == widget))
{
gboolean was_visible;
was_visible = GTK_WIDGET_VISIBLE (widget);
gtk_widget_unparent (widget);
toolbar->children = g_list_remove_link (toolbar->children, children);
@ -522,7 +529,7 @@ gtk_toolbar_remove (GtkContainer *container,
g_list_free (children);
toolbar->num_children--;
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
if (was_visible && GTK_WIDGET_VISIBLE (container))
gtk_widget_queue_resize (GTK_WIDGET (container));
break;
@ -643,7 +650,6 @@ gtk_toolbar_insert_item (GtkToolbar *toolbar,
if (child->label)
gtk_widget_show (child->label);
break;
default:

5
gtk/gtkviewport.c
View File

@ -351,13 +351,12 @@ gtk_viewport_unrealize (GtkWidget *widget)
gdk_window_set_user_data (widget->window, NULL);
gdk_window_destroy (widget->window);
widget->window = NULL;
gdk_window_set_user_data (viewport->view_window, NULL);
gdk_window_destroy (viewport->view_window);
viewport->view_window = NULL;
gdk_window_set_user_data (viewport->bin_window, NULL);
gdk_window_destroy (viewport->bin_window);
widget->window = NULL;
viewport->view_window = NULL;
viewport->bin_window = NULL;
}