toolbar: Don't override .constructed

We don't have any construct properties to wait for, so there is no
reason to split the code between init() and constructed().
This commit is contained in:
António Fernandes 2024-05-12 18:15:33 +01:00
parent 23e41c5aef
commit 02c67b8879

View file

@ -147,12 +147,17 @@ on_location_entry_focus_leave (GtkEventControllerFocus *controller,
}
static void
nautilus_toolbar_constructed (GObject *object)
nautilus_toolbar_init (NautilusToolbar *self)
{
NautilusToolbar *self = NAUTILUS_TOOLBAR (object);
GtkEventController *controller;
g_type_ensure (NAUTILUS_TYPE_HISTORY_CONTROLS);
g_type_ensure (NAUTILUS_TYPE_VIEW_CONTROLS);
g_type_ensure (NAUTILUS_TYPE_PATH_BAR);
g_type_ensure (NAUTILUS_TYPE_LOCATION_ENTRY);
gtk_widget_init_template (GTK_WIDGET (self));
GtkEventController *controller = gtk_event_controller_focus_new ();
controller = gtk_event_controller_focus_new ();
gtk_widget_add_controller (self->location_entry, controller);
g_signal_connect (controller, "leave",
G_CALLBACK (on_location_entry_focus_leave), self);
@ -164,17 +169,6 @@ nautilus_toolbar_constructed (GObject *object)
toolbar_update_appearance (self);
}
static void
nautilus_toolbar_init (NautilusToolbar *self)
{
g_type_ensure (NAUTILUS_TYPE_HISTORY_CONTROLS);
g_type_ensure (NAUTILUS_TYPE_VIEW_CONTROLS);
g_type_ensure (NAUTILUS_TYPE_PATH_BAR);
g_type_ensure (NAUTILUS_TYPE_LOCATION_ENTRY);
gtk_widget_init_template (GTK_WIDGET (self));
}
static void
nautilus_toolbar_get_property (GObject *object,
guint property_id,
@ -324,7 +318,6 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
oclass->set_property = nautilus_toolbar_set_property;
oclass->dispose = nautilus_toolbar_dispose;
oclass->finalize = nautilus_toolbar_finalize;
oclass->constructed = nautilus_toolbar_constructed;
properties[PROP_SHOW_LOCATION_ENTRY] =
g_param_spec_boolean ("show-location-entry",