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

Move timer removal in dispose

Browse Source 
Move removal of timer function in dispose to prevent potentially running
them on a diposed-but-not-finalized tooltip
This commit is contained in:
Paolo Borelli
2009-08-03 21:39:34 +02:00
committed by Paolo Borelli
parent b31f1cd80a
commit f97a33ad9c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktooltip.c
View File

@ -84,7 +84,7 @@ struct _GtkTooltipClass
static void gtk_tooltip_class_init (GtkTooltipClass *klass); static void gtk_tooltip_class_init (GtkTooltipClass *klass);
static void gtk_tooltip_init (GtkTooltip *tooltip); static void gtk_tooltip_init (GtkTooltip *tooltip);
static void gtk_tooltip_finalize (GObject *object); static void gtk_tooltip_dispose (GObject *object);
static void gtk_tooltip_window_style_set (GtkTooltip *tooltip); static void gtk_tooltip_window_style_set (GtkTooltip *tooltip);
static gboolean gtk_tooltip_paint_window (GtkTooltip *tooltip); static gboolean gtk_tooltip_paint_window (GtkTooltip *tooltip);
@ -106,7 +106,7 @@ gtk_tooltip_class_init (GtkTooltipClass *klass)
object_class = G_OBJECT_CLASS (klass); object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gtk_tooltip_finalize; object_class->dispose = gtk_tooltip_dispose;
} }
static void static void
@ -166,7 +166,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
} }
static void static void
gtk_tooltip_finalize (GObject *object) gtk_tooltip_dispose (GObject *object)
{ {
GtkTooltip *tooltip = GTK_TOOLTIP (object); GtkTooltip *tooltip = GTK_TOOLTIP (object);
@ -194,9 +194,10 @@ gtk_tooltip_finalize (GObject *object)
gtk_tooltip_display_closed, gtk_tooltip_display_closed,
tooltip); tooltip);
gtk_widget_destroy (tooltip->window); gtk_widget_destroy (tooltip->window);
tooltip->window = NULL;
} }
G_OBJECT_CLASS (gtk_tooltip_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_tooltip_parent_class)->dispose (object);
} }
/* public API */ /* public API */