diff --git a/src/app/browser.rs b/src/app/browser.rs index 0a858cbd..a96e815b 100644 --- a/src/app/browser.rs +++ b/src/app/browser.rs @@ -33,7 +33,7 @@ impl Browser { // Init widget let widget = Rc::new(Widget::new( - &window.widget.gobject, + &window.widget.g_box, &[ // Connect action groups (to apply accels) ( @@ -53,7 +53,7 @@ impl Browser { action.about.connect_activate({ let window = window.clone(); move || { - About::new().present(Some(&window.widget.gobject)); + About::new().present(Some(&window.widget.g_box)); } }); diff --git a/src/app/browser/window.rs b/src/app/browser/window.rs index ab11e820..7db8fcd7 100644 --- a/src/app/browser/window.rs +++ b/src/app/browser/window.rs @@ -10,7 +10,7 @@ use sqlite::Transaction; use tab::Tab; use widget::Widget; -use crate::app::browser::action::Action as BrowserAction; +use super::Action as BrowserAction; use crate::Profile; use gtk::glib::GString; use std::rc::Rc; diff --git a/src/app/browser/window/header.rs b/src/app/browser/window/header.rs index 293ee3b3..be83e548 100644 --- a/src/app/browser/window/header.rs +++ b/src/app/browser/window/header.rs @@ -4,8 +4,7 @@ mod widget; use bar::Bar; use widget::Widget; -use crate::app::browser::action::Action as BrowserAction; -use crate::app::browser::window::action::Action as WindowAction; +use super::{Action as WindowAction, BrowserAction}; use adw::TabView; use std::rc::Rc; diff --git a/src/app/browser/window/widget.rs b/src/app/browser/window/widget.rs index ed84ca72..027940fd 100644 --- a/src/app/browser/window/widget.rs +++ b/src/app/browser/window/widget.rs @@ -2,16 +2,16 @@ use adw::{TabView, ToolbarView}; use gtk::{prelude::BoxExt, Box, Orientation}; pub struct Widget { - pub gobject: Box, + pub g_box: Box, } impl Widget { // Construct pub fn new(header: &ToolbarView, tab: &TabView) -> Self { - let gobject = Box::builder().orientation(Orientation::Vertical).build(); - gobject.append(header); - gobject.append(tab); + let g_box = Box::builder().orientation(Orientation::Vertical).build(); + g_box.append(header); + g_box.append(tab); - Self { gobject } + Self { g_box } } }