general: Consolidate explicit dependencies down to adw and gtk4

Use the exported dependencies for everything else.

Cargo.lock

@@ -918,11 +918,7 @@ dependencies = [
  "anyhow",
  "ashpd",
  "cairo-rs",
- "gdk-pixbuf",
- "gdk4",
  "gettext-rs",
- "gio",
- "glib",
  "gtk-macros",
  "gtk4",
  "libadwaita",

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"

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;

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() {

src/util.rs

@@ -1,3 +1,5 @@
+use crate::deps::*;
+
 use gio::prelude::*;
 use glib::translate::*;
 

src/widgets/image.rs

@@ -17,9 +17,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use gdk::prelude::*;
+use crate::deps::*;
-use gio::subclass::prelude::*;
+
-use gtk::{graphene, prelude::*, subclass::prelude::*};
+use gtk::{prelude::*, subclass::prelude::*};
 
 use once_cell::sync::Lazy;
 

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::*;

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::*;