AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-05 02:11:08 +00:00
Code Issues Projects Releases Wiki Activity

placesview: Use dispose instead of destroy

Browse Source 
The destroy vfunc is going away.
This commit is contained in:
Matthias Clasen 2020-05-05 16:51:43 -04:00
parent 82f4b1630c
commit d03b1524e6
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkplacesview.c
View File

@ -395,27 +395,6 @@ activate_row (GtkPlacesView *view,
static void update_places (GtkPlacesView *view);
static void
gtk_places_view_destroy (GtkWidget *widget)
{
GtkPlacesView *view = GTK_PLACES_VIEW (widget);
view->destroyed = 1;
g_signal_handlers_disconnect_by_func (view->volume_monitor, update_places, widget);
if (view->network_monitor)
g_signal_handlers_disconnect_by_func (view->network_monitor, update_places, widget);
if (view->server_list_monitor)
g_signal_handlers_disconnect_by_func (view->server_list_monitor, server_file_changed_cb, widget);
g_cancellable_cancel (view->cancellable);
g_cancellable_cancel (view->networks_fetching_cancellable);
GTK_WIDGET_CLASS (gtk_places_view_parent_class)->destroy (widget);
}
static void
gtk_places_view_finalize (GObject *object)
{
@ -442,6 +421,18 @@ gtk_places_view_dispose (GObject *object)
{
GtkPlacesView *view = (GtkPlacesView *)object;
view->destroyed = 1;
g_signal_handlers_disconnect_by_func (view->volume_monitor, update_places, object);
if (view->network_monitor)
g_signal_handlers_disconnect_by_func (view->network_monitor, update_places, object);
if (view->server_list_monitor)
g_signal_handlers_disconnect_by_func (view->server_list_monitor, server_file_changed_cb, object);
g_cancellable_cancel (view->cancellable);
g_cancellable_cancel (view->networks_fetching_cancellable);
g_clear_pointer (&view->popup_menu, gtk_widget_unparent);
G_OBJECT_CLASS (gtk_places_view_parent_class)->dispose (object);
@ -2169,7 +2160,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;
/*