From 81273c736ea534e83d10baede8c61afa4b4a80a1 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Sat, 6 Aug 2022 00:48:52 -0400
Subject: [PATCH] general: Update libadwaita-rs

Allows us to clean up our imports a bit.
---
 Cargo.lock                     | 9 +++++----
 Cargo.toml                     | 3 ++-
 src/application.rs             | 1 -
 src/widgets/image_page.rs      | 1 -
 src/widgets/image_view.rs      | 1 -
 src/widgets/properties_view.rs | 1 -
 src/window.rs                  | 1 -
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 57dc11e..79c0476 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -805,10 +805,11 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libadwaita"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4b1d54d907dfa5d6663fdf4bdbe46c34747258b85c787adbf66187ccbaac81"
+checksum = "49ad2318c7abc8629b1d1ed381bd0356c184ae8f4caebc044ef9de1782c86046"
 dependencies = [
+ "futures-channel",
  "gdk-pixbuf",
  "gdk4",
  "gio",
@@ -822,9 +823,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
+checksum = "e835f99b92f6e7f43ddb2c0ca79d9d21124a170190876505e03484f337f7edc7"
 dependencies = [
  "gdk4-sys",
  "gio-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 416277d..8dadbe1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,8 @@ features = ["v2_70"]
 
 [dependencies.adw]
 package = "libadwaita"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
+features = ["v1_2"]
 
 [dependencies.gettext-rs]
 version = "0.7.0"
diff --git a/src/application.rs b/src/application.rs
index ced0226..c151528 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -23,7 +23,6 @@ use crate::i18n::*;
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use glib::clone;
-use gtk::subclass::prelude::*;
 use gtk_macros::*;
 
 use crate::config;
diff --git a/src/widgets/image_page.rs b/src/widgets/image_page.rs
index 44b5520..dee8d1b 100644
--- a/src/widgets/image_page.rs
+++ b/src/widgets/image_page.rs
@@ -22,7 +22,6 @@ use crate::deps::*;
 use adw::subclass::prelude::*;
 use glib::clone;
 use gtk::prelude::*;
-use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 
 use gtk_macros::spawn;
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 4e2cca2..49da4dc 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -23,7 +23,6 @@ use crate::i18n::*;
 use adw::subclass::prelude::*;
 use glib::clone;
 use gtk::prelude::*;
-use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 
 use anyhow::{bail, Context};
diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs
index 3cc4c59..d3d3502 100644
--- a/src/widgets/properties_view.rs
+++ b/src/widgets/properties_view.rs
@@ -23,7 +23,6 @@ use crate::util;
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use glib::clone;
-use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 
 use anyhow::Context;
diff --git a/src/window.rs b/src/window.rs
index 6606e4b..18e7e20 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -23,7 +23,6 @@ use crate::i18n::*;
 use adw::subclass::prelude::*;
 use glib::clone;
 use gtk::prelude::*;
-use gtk::subclass::prelude::*;
 use gtk::CompositeTemplate;
 
 use ashpd::desktop::open_uri;