From 330016dd1519627dc78a680271302c5ec0e5a98c Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Sun, 11 Feb 2024 16:17:30 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20don't=20use=20gdk,=20gio=20expli?=
 =?UTF-8?q?citly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                 | 1 -
 Cargo.toml                 | 1 -
 src/application_browser.rs | 4 ++--
 src/main.rs                | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64607f0..09c5662 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -166,7 +166,6 @@ version = "0.10.5"
 dependencies = [
  "alpm",
  "alpm-utils",
- "gdk",
  "gdk-pixbuf 0.19.0",
  "gio 0.19.0",
  "glib 0.19.0",
diff --git a/Cargo.toml b/Cargo.toml
index f06ea1e..98adc45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ i18n-embed-fl = "0.8"
 rust-embed = { version = "8", features = ["debug-embed", "include-exclude"] }
 gtk = { version = "0.18", default-features = false }
 gio = { version = "0.19", default-features = false }
-gdk = "0.18"
 gdk-pixbuf = "0.19"
 glib = { default-features = false, version = "0.19" }
 serde = { version = "1", default-features = false }
diff --git a/src/application_browser.rs b/src/application_browser.rs
index 6c8c3ee..2903fe3 100644
--- a/src/application_browser.rs
+++ b/src/application_browser.rs
@@ -399,9 +399,9 @@ fn on_query_tooltip_tree_view(
 
 fn on_button_press_event_tree_view(
     treeview: &gtk::TreeView,
-    event_btn: &gdk::EventButton,
+    event_btn: &gtk::gdk::EventButton,
 ) -> gtk::glib::Propagation {
-    if event_btn.button() == 1 && event_btn.event_type() == gdk::EventType::DoubleButtonPress {
+    if event_btn.button() == 1 && event_btn.event_type() == gtk::gdk::EventType::DoubleButtonPress {
         if let Some(coords) = event_btn.coords() {
             let (x, y) = coords;
             let path_info = treeview.path_at_pos(x as i32, y as i32);
diff --git a/src/main.rs b/src/main.rs
index 1c2aadb..1082f99 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,8 +15,8 @@ mod utils;
 
 use config::{APP_ID, PROFILE, VERSION};
 use data_types::*;
-use glib::GString;
-use gtk::{gio, glib, Builder, HeaderBar, Window};
+use gtk::glib::GString;
+use gtk::{gdk, glib, Builder, HeaderBar, Window};
 use i18n_embed::DesktopLanguageRequester;
 use once_cell::sync::Lazy;
 use std::collections::HashMap;
@@ -25,7 +25,7 @@ use std::sync::{Arc, Mutex};
 use unic_langid::LanguageIdentifier;
 use utils::*;
 
-use gio::prelude::*;
+use gtk::gio::prelude::*;
 use gtk::prelude::*;
 
 use gtk::gdk_pixbuf::Pixbuf;