diff options
| author | António Fernandes <antoniof@gnome.org> | 2021-08-15 21:50:02 +0100 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2021-08-16 09:59:25 +0100 |
| commit | 3b53d7b2f4fc6f806a9b4153697212bf7543e84f (patch) | |
| tree | 0facd8f8053e5b81fdf81989063bb9238672ee9d /src/nautilus-properties-window.c | |
| parent | 59040d0d6128956e63c2374eabd513ecd5241d1b (diff) | |
| download | nautilus-wip/antoniof/gtk4-preparation-miscellaneous.tar.gz | |
general: Stop overriding GtkWidget.destroy()wip/antoniof/gtk4-preparation-miscellaneous
It's gone in GTK4.
Anything we are doing on ::destroy can be done on ::dispose().
Extra care must be taken, however, because GObject.dispose() may be
run multiple times.
Also, while we are at it, move some object unreferencing from
.finalize() to .dispose(), which is where we should do it.
Diffstat (limited to 'src/nautilus-properties-window.c')
| -rw-r--r-- | src/nautilus-properties-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index a841eed97..c0bfdaa79 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -5090,7 +5090,7 @@ nautilus_properties_window_present (GList *original_f } static void -real_destroy (GtkWidget *object) +real_dispose (GObject *object) { NautilusPropertiesWindow *self; @@ -5133,7 +5133,7 @@ real_destroy (GtkWidget *object) g_clear_handle_id (&self->update_directory_contents_timeout_id, g_source_remove); g_clear_handle_id (&self->update_files_timeout_id, g_source_remove); - GTK_WIDGET_CLASS (nautilus_properties_window_parent_class)->destroy (object); + G_OBJECT_CLASS (nautilus_properties_window_parent_class)->dispose (object); } static void @@ -5375,8 +5375,8 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *klass) widget_class = GTK_WIDGET_CLASS (klass); oclass = G_OBJECT_CLASS (klass); + oclass->dispose = real_dispose; oclass->finalize = real_finalize; - widget_class->destroy = real_destroy; binding_set = gtk_binding_set_by_class (klass); g_signal_new ("close", |