diff --git a/src/app.rs b/src/app.rs index fb225709..58d26421 100644 --- a/src/app.rs +++ b/src/app.rs @@ -28,7 +28,7 @@ pub struct App { // Extras // database: Arc, // GTK - application: Application, + gobject: Application, } impl App { @@ -76,30 +76,30 @@ impl App { let action_tab_pin = Action::new("win", true); // Init GTK - let application = Application::builder() + let gobject = Application::builder() .application_id(APPLICATION_ID) .build(); // Init accels - application.set_accels_for_action(&action_tool_debug.detailed_name(), &["i"]); - application.set_accels_for_action(&action_update.detailed_name(), &["u"]); - application.set_accels_for_action(&action_quit.detailed_name(), &["Escape"]); - application.set_accels_for_action(&action_tab_append.detailed_name(), &["t"]); - application.set_accels_for_action(&action_tab_pin.detailed_name(), &["p"]); - application.set_accels_for_action(&action_tab_close.detailed_name(), &["q"]); - application.set_accels_for_action( + gobject.set_accels_for_action(&action_tool_debug.detailed_name(), &["i"]); + gobject.set_accels_for_action(&action_update.detailed_name(), &["u"]); + gobject.set_accels_for_action(&action_quit.detailed_name(), &["Escape"]); + gobject.set_accels_for_action(&action_tab_append.detailed_name(), &["t"]); + gobject.set_accels_for_action(&action_tab_pin.detailed_name(), &["p"]); + gobject.set_accels_for_action(&action_tab_close.detailed_name(), &["q"]); + gobject.set_accels_for_action( &action_tab_page_navigation_base.detailed_name(), &["h"], ); - application.set_accels_for_action( + gobject.set_accels_for_action( &action_tab_page_navigation_history_back.detailed_name(), &["Left"], ); - application.set_accels_for_action( + gobject.set_accels_for_action( &action_tab_page_navigation_history_forward.detailed_name(), &["Right"], ); - application.set_accels_for_action( + gobject.set_accels_for_action( &action_tab_page_navigation_reload.detailed_name(), &["r"], ); @@ -123,7 +123,7 @@ impl App { )); // Init events - application.connect_activate({ + gobject.connect_activate({ let action_update = action_update.simple(); move |_| { // Make initial update @@ -131,7 +131,7 @@ impl App { } }); - application.connect_startup({ + gobject.connect_startup({ let browser = browser.clone(); let database = database.clone(); let profile_database_connection = profile_database_connection.clone(); @@ -166,7 +166,7 @@ impl App { } }); - application.connect_shutdown({ + gobject.connect_shutdown({ // let browser = browser.clone(); let profile_database_connection = profile_database_connection.clone(); let database = database.clone(); @@ -227,12 +227,12 @@ impl App { // Extras // database, // GTK - application, + gobject, } } // Actions pub fn run(&self) -> ExitCode { - self.application.run() + self.gobject.run() } }