From 1ae7316b324a7d6fa084e0d54aa3386eb2478b96 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Tue, 21 Dec 2021 16:09:48 -0800
Subject: [PATCH] general: Consolidate explicit dependencies down to adw and
 gtk4

Use the exported dependencies for everything else.
---
 Cargo.lock                | 4 ----
 Cargo.toml                | 7 -------
 src/application.rs        | 2 ++
 src/main.rs               | 6 +++++-
 src/util.rs               | 2 ++
 src/widgets/image.rs      | 6 +++---
 src/widgets/image_view.rs | 3 ++-
 src/window.rs             | 3 ++-
 8 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0dac69..815c49b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,11 +918,7 @@ dependencies = [
  "anyhow",
  "ashpd",
  "cairo-rs",
- "gdk-pixbuf",
- "gdk4",
  "gettext-rs",
- "gio",
- "glib",
  "gtk-macros",
  "gtk4",
  "libadwaita",
diff --git a/Cargo.toml b/Cargo.toml
index 741d458..f5b996f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,6 @@ once_cell = "1.5.2"
 pretty_env_logger = "0.4.0"
 zbus = "1.3.0"
 zvariant = "2.3.0"
-gdk-pixbuf = "0.14"
-gio = "0.14"
-glib = "0.14"
 cairo-rs = "0.14"
 
 [dependencies.ashpd]
@@ -24,10 +21,6 @@ features = ["feature_gtk4"]
 package = "gtk4"
 version = "0.3"
 
-[dependencies.gdk]
-package = "gdk4"
-version = "0.3"
-
 [dependencies.adw]
 package = "libadwaita"
 version = "0.1.0-alpha-6"
diff --git a/src/application.rs b/src/application.rs
index 60786f9..a6399a7 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -17,6 +17,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+use crate::deps::*;
+
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use glib::clone;
diff --git a/src/main.rs b/src/main.rs
index 7658bfe..72907c1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 use gettextrs::*;
-use gio::prelude::*;
+use gtk::gio::{self, prelude::*};
 
 mod application;
 mod config;
@@ -26,6 +26,10 @@ mod util;
 mod widgets;
 mod window;
 
+mod deps {
+    pub use gtk::{gdk, gdk_pixbuf, gio, glib, graphene};
+}
+
 use application::LpApplication;
 
 fn main() {
diff --git a/src/util.rs b/src/util.rs
index 002132a..91d1485 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,3 +1,5 @@
+use crate::deps::*;
+
 use gio::prelude::*;
 use glib::translate::*;
 
diff --git a/src/widgets/image.rs b/src/widgets/image.rs
index 1b5ca9f..b29b5dc 100644
--- a/src/widgets/image.rs
+++ b/src/widgets/image.rs
@@ -17,9 +17,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use gdk::prelude::*;
-use gio::subclass::prelude::*;
-use gtk::{graphene, prelude::*, subclass::prelude::*};
+use crate::deps::*;
+
+use gtk::{prelude::*, subclass::prelude::*};
 
 use once_cell::sync::Lazy;
 
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 2908dc8..6e63d27 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -17,8 +17,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+use crate::deps::*;
+
 use adw::subclass::prelude::*;
-use gdk::prelude::*;
 use glib::clone;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
diff --git a/src/window.rs b/src/window.rs
index 02400f1..a40391a 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -17,8 +17,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+use crate::deps::*;
+
 use adw::subclass::prelude::*;
-use gio::prelude::*;
 use glib::clone;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;