[gtk/abolish-destroy: 20/23] placesview: Use dispose instead of destroy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/abolish-destroy: 20/23] placesview: Use dispose instead of destroy
- Date: Tue, 5 May 2020 21:02:34 +0000 (UTC)
commit 400d4158e5980d8a1cc013246344e8cd1b409a44
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 5 16:51:43 2020 -0400
placesview: Use dispose instead of destroy
The destroy vfunc is going away.
gtk/gtkplacesview.c | 35 ++++++++++++-----------------------
1 file changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 721f2cbe33..ea74c68b3c 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -388,28 +388,6 @@ activate_row (GtkPlacesView *view,
static void update_places (GtkPlacesView *view);
-static void
-gtk_places_view_destroy (GtkWidget *widget)
-{
- GtkPlacesView *self = GTK_PLACES_VIEW (widget);
- GtkPlacesViewPrivate *priv = gtk_places_view_get_instance_private (self);
-
- priv->destroyed = 1;
-
- g_signal_handlers_disconnect_by_func (priv->volume_monitor, update_places, widget);
-
- if (priv->network_monitor)
- g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
-
- if (priv->server_list_monitor)
- g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
-
- g_cancellable_cancel (priv->cancellable);
- g_cancellable_cancel (priv->networks_fetching_cancellable);
-
- GTK_WIDGET_CLASS (gtk_places_view_parent_class)->destroy (widget);
-}
-
static void
gtk_places_view_finalize (GObject *object)
{
@@ -438,6 +416,18 @@ gtk_places_view_dispose (GObject *object)
GtkPlacesView *self = (GtkPlacesView *)object;
GtkPlacesViewPrivate *priv = gtk_places_view_get_instance_private (self);
+ priv->destroyed = 1;
+
+ g_signal_handlers_disconnect_by_func (priv->volume_monitor, update_places, object);
+
+ if (priv->network_monitor)
+ g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, object);
+
+ if (priv->server_list_monitor)
+ g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, object);
+
+ g_cancellable_cancel (priv->cancellable);
+ g_cancellable_cancel (priv->networks_fetching_cancellable);
g_clear_pointer (&priv->popup_menu, gtk_widget_unparent);
G_OBJECT_CLASS (gtk_places_view_parent_class)->dispose (object);
@@ -2236,7 +2226,6 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
object_class->get_property = gtk_places_view_get_property;
object_class->set_property = gtk_places_view_set_property;
- widget_class->destroy = gtk_places_view_destroy;
widget_class->map = gtk_places_view_map;
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]