diff options
author | Benjamin Otte <otte@redhat.com> | 2021-08-23 05:55:56 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 19:59:41 -0400 |
commit | d36b27cc3a6113712d7c754b53ef185e915a8120 (patch) | |
tree | d2d44592a2e594a699b2eecb2d9558fc884aa178 | |
parent | eec783b92263fe1f99d52bdb6441ae37f58715ce (diff) | |
download | gtk+-d36b27cc3a6113712d7c754b53ef185e915a8120.tar.gz |
fontbutton: Destroy dialog in unrealize()
This way, we can be sure it's always using the right display.
We can also be sure that it doesn't leak.
-rw-r--r-- | gtk/gtkfontbutton.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index aad99d186b..fe125fd84d 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -462,6 +462,16 @@ gtk_font_button_activate (GtkFontButton *self) } static void +gtk_font_button_unrealize (GtkWidget *widget) +{ + GtkFontButton *font_button = GTK_FONT_BUTTON (widget); + + g_clear_pointer ((GtkWindow **) &font_button->font_dialog, gtk_window_destroy); + + GTK_WIDGET_CLASS (gtk_font_button_parent_class)->unrealize (widget); +} + +static void gtk_font_button_class_init (GtkFontButtonClass *klass) { GObjectClass *gobject_class; @@ -476,6 +486,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass) widget_class->grab_focus = gtk_widget_grab_focus_child; widget_class->focus = gtk_widget_focus_child; + widget_class->unrealize = gtk_font_button_unrealize; klass->font_set = NULL; klass->activate = gtk_font_button_activate; @@ -628,9 +639,6 @@ gtk_font_button_finalize (GObject *object) { GtkFontButton *font_button = GTK_FONT_BUTTON (object); - if (font_button->font_dialog != NULL) - gtk_window_destroy (GTK_WINDOW (font_button->font_dialog)); - g_free (font_button->title); clear_font_data (font_button); |