From 9b126429604c266b40eb78a5a6f1b80f766b50f9 Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 23 Sep 2024 02:17:53 +0300 Subject: [PATCH] use namespaces --- src/browser/mod.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/browser/mod.rs b/src/browser/mod.rs index f1e4fdd4..0d093d2f 100644 --- a/src/browser/mod.rs +++ b/src/browser/mod.rs @@ -3,6 +3,8 @@ mod header; mod main; mod widget; +use gtk::gio::ActionEntry; +use gtk::{Application, ApplicationWindow}; use std::sync::Arc; use gtk::prelude::{ActionMapExtManual, GtkWindowExt}; @@ -17,8 +19,8 @@ pub struct Browser { impl Browser { // Construct new browser pub fn new( - app: >k::Application, - connection: std::sync::Arc, // @TODO glib clone macro? + app: &Application, + connection: Arc, // @TODO glib clone macro? default_width: i32, default_height: i32, ) -> Browser { @@ -37,17 +39,17 @@ impl Browser { // Init actions @TODO separated module widget.gtk().add_action_entries([ - gtk::gio::ActionEntry::builder("debug") - .activate(|this: >k::ApplicationWindow, _, _| { + ActionEntry::builder("debug") + .activate(|this: &ApplicationWindow, _, _| { this.emit_enable_debugging(true); }) .build(), - gtk::gio::ActionEntry::builder("quit") - .activate(|this: >k::ApplicationWindow, _, _| { + ActionEntry::builder("quit") + .activate(|this: &ApplicationWindow, _, _| { this.close(); }) .build(), - gtk::gio::ActionEntry::builder("tab_append") + ActionEntry::builder("tab_append") .activate({ let main = main.clone(); move |_, _, _| {