From b884768067709feb99c2db7fe2ad6540fba9f3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Thu, 5 Aug 2021 23:16:54 +0100 Subject: [PATCH] floating-bar: Handle parent changes in GObject::notify GtkWidget::parent-set is gone in GTK4. --- src/nautilus-floating-bar.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c index bd148eea3..10fa19773 100644 --- a/src/nautilus-floating-bar.c +++ b/src/nautilus-floating-bar.c @@ -301,13 +301,14 @@ on_event_controller_motion_motion (GtkEventControllerMotion *controller, } static void -nautilus_floating_bar_parent_set (GtkWidget *widget, - GtkWidget *old_parent) +on_parent_changed (GObject *object, + GParamSpec *pspec, + gpointer user_data) { - NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (widget); + NautilusFloatingBar *self = NAUTILUS_FLOATING_BAR (object); GtkWidget *parent; - parent = gtk_widget_get_parent (widget); + parent = gtk_widget_get_parent (GTK_WIDGET (object)); g_clear_object (&self->motion_controller); @@ -490,6 +491,11 @@ nautilus_floating_bar_init (NautilusFloatingBar *self) self->motion_controller = NULL; self->pointer_y_in_parent_coordinates = -1; + + g_signal_connect (self, + "notify::parent", + G_CALLBACK (on_parent_changed), + NULL); } static void @@ -507,7 +513,6 @@ nautilus_floating_bar_class_init (NautilusFloatingBarClass *klass) wclass->get_preferred_width_for_height = nautilus_floating_bar_get_preferred_width_for_height; wclass->get_preferred_height = nautilus_floating_bar_get_preferred_height; wclass->get_preferred_height_for_width = nautilus_floating_bar_get_preferred_height_for_width; - wclass->parent_set = nautilus_floating_bar_parent_set; properties[PROP_PRIMARY_LABEL] = g_param_spec_string ("primary-label",