- gui->view = aweather_view_new();
- gui->window = GTK_WINDOW (gtk_builder_get_object(gui->builder, "main"));
- gui->tabs = GTK_NOTEBOOK (gtk_builder_get_object(gui->builder, "tabs"));
- gui->drawing = GTK_DRAWING_AREA(gtk_builder_get_object(gui->builder, "drawing"));
- gtk_builder_connect_signals(gui->builder, gui);
-
+ gtk_builder_connect_signals(self->builder, self);
+ g_signal_connect(self, "delete-event", G_CALLBACK(gtk_main_quit), self);
+ g_signal_connect(self, "key-press-event", G_CALLBACK(on_key_press), self);
+ gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self));