From 96d1cb3a697c1f16b7b7c2b544219fa71e189398 Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Fri, 22 Jul 2022 11:25:51 +0200
Subject: [PATCH] chore: Update libadwaita

---
 Cargo.lock                                               | 9 +++++----
 Cargo.toml                                               | 3 ++-
 src/account_switcher/avatar_with_selection.rs            | 2 +-
 src/components/action_button.rs                          | 2 +-
 src/components/audio_player.rs                           | 2 +-
 src/components/auth_dialog.rs                            | 1 -
 src/components/avatar.rs                                 | 2 +-
 src/components/badge.rs                                  | 2 +-
 src/components/button_row.rs                             | 1 -
 src/components/context_menu_bin.rs                       | 2 +-
 src/components/custom_entry.rs                           | 2 +-
 src/components/editable_avatar.rs                        | 1 -
 src/components/entry_row.rs                              | 1 -
 src/components/in_app_notification.rs                    | 2 +-
 src/components/location_viewer.rs                        | 2 +-
 src/components/media_content_viewer.rs                   | 2 +-
 src/components/password_entry_row.rs                     | 1 -
 src/components/pill.rs                                   | 2 +-
 src/components/reaction_chooser.rs                       | 2 +-
 src/components/room_title.rs                             | 2 +-
 src/components/spinner_button.rs                         | 2 +-
 src/components/video_player.rs                           | 2 +-
 src/login/login_advanced_dialog.rs                       | 2 +-
 src/session/account_settings/devices_page/mod.rs         | 2 +-
 src/session/account_settings/mod.rs                      | 1 -
 .../user_page/change_password_subpage.rs                 | 1 -
 .../user_page/deactivate_account_subpage.rs              | 1 -
 src/session/account_settings/user_page/mod.rs            | 1 -
 src/session/content/explore/mod.rs                       | 2 +-
 src/session/content/invite.rs                            | 2 +-
 src/session/content/mod.rs                               | 2 +-
 src/session/content/room_details/invite_subpage/mod.rs   | 2 +-
 src/session/content/room_details/member_page/mod.rs      | 1 -
 src/session/content/room_details/mod.rs                  | 1 -
 src/session/content/room_history/divider_row.rs          | 2 +-
 src/session/content/room_history/item_row.rs             | 2 +-
 src/session/content/room_history/message_row/audio.rs    | 1 -
 src/session/content/room_history/message_row/file.rs     | 2 +-
 src/session/content/room_history/message_row/location.rs | 2 +-
 src/session/content/room_history/message_row/media.rs    | 1 -
 src/session/content/room_history/message_row/mod.rs      | 1 -
 src/session/content/room_history/message_row/reaction.rs | 2 +-
 .../content/room_history/message_row/reaction_list.rs    | 2 +-
 src/session/content/room_history/message_row/reply.rs    | 2 +-
 src/session/content/room_history/message_row/text.rs     | 2 +-
 src/session/content/room_history/mod.rs                  | 1 -
 src/session/content/room_history/state_row/creation.rs   | 2 +-
 src/session/content/room_history/state_row/mod.rs        | 2 +-
 src/session/content/room_history/state_row/tombstone.rs  | 2 +-
 .../content/room_history/verification_info_bar.rs        | 2 +-
 src/session/content/verification/emoji.rs                | 2 +-
 .../content/verification/identity_verification_widget.rs | 2 +-
 src/session/content/verification/session_verification.rs | 2 +-
 src/session/event_source_dialog.rs                       | 2 +-
 src/session/media_viewer.rs                              | 2 +-
 src/session/room_creation/mod.rs                         | 2 +-
 src/session/sidebar/mod.rs                               | 1 -
 src/session/sidebar/row.rs                               | 2 +-
 58 files changed, 47 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b899b2e5..dabd2ab3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2139,10 +2139,11 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libadwaita"
-version = "0.1.1"
+version = "0.2.0-alpha.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ae453d28e3b91f03749f02b1531e8cfe315a1d0762b77a61797d2ab80bb87d"
+checksum = "49ad2318c7abc8629b1d1ed381bd0356c184ae8f4caebc044ef9de1782c86046"
 dependencies = [
+ "futures-channel",
  "gdk-pixbuf",
  "gdk4",
  "gio",
@@ -2156,9 +2157,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 4697fe2b..0be2a9de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,8 @@ features = ["v4_6"]
 
 [dependencies.adw]
 package = "libadwaita"
-version = "0.1.0"
+version = "0.2.0-alpha.2"
+features = ["v1_2"]
 
 [dependencies.shumate]
 package = "libshumate"
diff --git a/src/account_switcher/avatar_with_selection.rs b/src/account_switcher/avatar_with_selection.rs
index ed133cb6..152c0485 100644
--- a/src/account_switcher/avatar_with_selection.rs
+++ b/src/account_switcher/avatar_with_selection.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::{components::Avatar, session::Avatar as AvatarItem};
 
diff --git a/src/components/action_button.rs b/src/components/action_button.rs
index cc627059..7b01e949 100644
--- a/src/components/action_button.rs
+++ b/src/components/action_button.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::closure_local, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::closure_local, prelude::*, CompositeTemplate};
 
 #[derive(Debug, Hash, Eq, PartialEq, Clone, Copy, glib::Enum)]
 #[repr(u32)]
diff --git a/src/components/audio_player.rs b/src/components/audio_player.rs
index e68cb7d5..a8867ed7 100644
--- a/src/components/audio_player.rs
+++ b/src/components/audio_player.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use std::cell::{Cell, RefCell};
diff --git a/src/components/auth_dialog.rs b/src/components/auth_dialog.rs
index ab3d5521..71cbe057 100644
--- a/src/components/auth_dialog.rs
+++ b/src/components/auth_dialog.rs
@@ -6,7 +6,6 @@ use gtk::{
     gio::prelude::*,
     glib::{self, clone},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use matrix_sdk::{
diff --git a/src/components/avatar.rs b/src/components/avatar.rs
index 717a6f37..b18eefc9 100644
--- a/src/components/avatar.rs
+++ b/src/components/avatar.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::session::Avatar as AvatarItem;
 
diff --git a/src/components/badge.rs b/src/components/badge.rs
index 81aee0fc..4bac0dde 100644
--- a/src/components/badge.rs
+++ b/src/components/badge.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*};
+use gtk::glib;
 
 use crate::session::room::{MemberRole, PowerLevel, POWER_LEVEL_MAX, POWER_LEVEL_MIN};
 
diff --git a/src/components/button_row.rs b/src/components/button_row.rs
index 88c0b252..d5f779b6 100644
--- a/src/components/button_row.rs
+++ b/src/components/button_row.rs
@@ -3,7 +3,6 @@ use gtk::{
     glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 
diff --git a/src/components/context_menu_bin.rs b/src/components/context_menu_bin.rs
index 16a2e57d..f7762fd9 100644
--- a/src/components/context_menu_bin.rs
+++ b/src/components/context_menu_bin.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 use log::debug;
 
 mod imp {
diff --git a/src/components/custom_entry.rs b/src/components/custom_entry.rs
index ac60aafa..d1f093c1 100644
--- a/src/components/custom_entry.rs
+++ b/src/components/custom_entry.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, subclass::prelude::*};
+use gtk::glib;
 
 mod imp {
     use super::*;
diff --git a/src/components/editable_avatar.rs b/src/components/editable_avatar.rs
index 7582d859..52b4195c 100644
--- a/src/components/editable_avatar.rs
+++ b/src/components/editable_avatar.rs
@@ -4,7 +4,6 @@ use gtk::{
     gdk, gio, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;
diff --git a/src/components/entry_row.rs b/src/components/entry_row.rs
index 78f792b3..ff4058f0 100644
--- a/src/components/entry_row.rs
+++ b/src/components/entry_row.rs
@@ -3,7 +3,6 @@ use gtk::{
     gdk, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 
diff --git a/src/components/in_app_notification.rs b/src/components/in_app_notification.rs
index 980a8091..268a0b54 100644
--- a/src/components/in_app_notification.rs
+++ b/src/components/in_app_notification.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::components::Toast;
 
diff --git a/src/components/location_viewer.rs b/src/components/location_viewer.rs
index fe52b9c4..ce746849 100644
--- a/src/components/location_viewer.rs
+++ b/src/components/location_viewer.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use shumate::prelude::*;
 
 use crate::i18n::gettext_f;
diff --git a/src/components/media_content_viewer.rs b/src/components/media_content_viewer.rs
index b0168787..dc4bbc7e 100644
--- a/src/components/media_content_viewer.rs
+++ b/src/components/media_content_viewer.rs
@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{gdk, gio, glib, glib::clone, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, gio, glib, glib::clone, CompositeTemplate};
 use log::warn;
 
 use super::{AudioPlayer, LocationViewer};
diff --git a/src/components/password_entry_row.rs b/src/components/password_entry_row.rs
index 1dbcc2e2..048404c4 100644
--- a/src/components/password_entry_row.rs
+++ b/src/components/password_entry_row.rs
@@ -3,7 +3,6 @@ use gtk::{
     gdk, glib,
     glib::{clone, closure_local},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 
diff --git a/src/components/pill.rs b/src/components/pill.rs
index 2691a787..fe744674 100644
--- a/src/components/pill.rs
+++ b/src/components/pill.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::{
     components::Avatar,
diff --git a/src/components/reaction_chooser.rs b/src/components/reaction_chooser.rs
index 0f439deb..d396ae00 100644
--- a/src/components/reaction_chooser.rs
+++ b/src/components/reaction_chooser.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::session::room::ReactionList;
 
diff --git a/src/components/room_title.rs b/src/components/room_title.rs
index 2c8d1a83..4302efef 100644
--- a/src/components/room_title.rs
+++ b/src/components/room_title.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use html2pango::markup;
 
 mod imp {
diff --git a/src/components/spinner_button.rs b/src/components/spinner_button.rs
index e21c1bfb..e7e29b8d 100644
--- a/src/components/spinner_button.rs
+++ b/src/components/spinner_button.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;
diff --git a/src/components/video_player.rs b/src/components/video_player.rs
index 2f79671e..9fa6cc23 100644
--- a/src/components/video_player.rs
+++ b/src/components/video_player.rs
@@ -1,7 +1,7 @@
 use adw::subclass::prelude::*;
 use gst::ClockTime;
 use gst_player::{Player, PlayerGMainContextSignalDispatcher};
-use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, prelude::*, CompositeTemplate};
 
 use super::VideoPlayerRenderer;
 
diff --git a/src/login/login_advanced_dialog.rs b/src/login/login_advanced_dialog.rs
index 80dd9e53..4b281b2b 100644
--- a/src/login/login_advanced_dialog.rs
+++ b/src/login/login_advanced_dialog.rs
@@ -1,7 +1,7 @@
 use std::cell::Cell;
 
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;
diff --git a/src/session/account_settings/devices_page/mod.rs b/src/session/account_settings/devices_page/mod.rs
index 29139717..0da361a4 100644
--- a/src/session/account_settings/devices_page/mod.rs
+++ b/src/session/account_settings/devices_page/mod.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 mod device;
 use self::device::Device;
diff --git a/src/session/account_settings/mod.rs b/src/session/account_settings/mod.rs
index e27e487c..b50a0266 100644
--- a/src/session/account_settings/mod.rs
+++ b/src/session/account_settings/mod.rs
@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     glib,
     glib::{clone, FromVariant},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 
diff --git a/src/session/account_settings/user_page/change_password_subpage.rs b/src/session/account_settings/user_page/change_password_subpage.rs
index 0e2a71f1..157d0416 100644
--- a/src/session/account_settings/user_page/change_password_subpage.rs
+++ b/src/session/account_settings/user_page/change_password_subpage.rs
@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
 use gtk::{
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;
diff --git a/src/session/account_settings/user_page/deactivate_account_subpage.rs b/src/session/account_settings/user_page/deactivate_account_subpage.rs
index a7816b1a..8974d0b8 100644
--- a/src/session/account_settings/user_page/deactivate_account_subpage.rs
+++ b/src/session/account_settings/user_page/deactivate_account_subpage.rs
@@ -2,7 +2,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
 use gtk::{
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;
diff --git a/src/session/account_settings/user_page/mod.rs b/src/session/account_settings/user_page/mod.rs
index f2ff309c..44f29197 100644
--- a/src/session/account_settings/user_page/mod.rs
+++ b/src/session/account_settings/user_page/mod.rs
@@ -5,7 +5,6 @@ use gettextrs::gettext;
 use gtk::{
     gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::error;
diff --git a/src/session/content/explore/mod.rs b/src/session/content/explore/mod.rs
index b39db04d..34d802b2 100644
--- a/src/session/content/explore/mod.rs
+++ b/src/session/content/explore/mod.rs
@@ -3,7 +3,7 @@ mod public_room_list;
 mod public_room_row;
 
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::error;
 use ruma::api::client::thirdparty::get_protocols;
 
diff --git a/src/session/content/invite.rs b/src/session/content/invite.rs
index f81b9a43..86a48a3f 100644
--- a/src/session/content/invite.rs
+++ b/src/session/content/invite.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::{
     components::{Avatar, LabelWithWidgets, Pill, SpinnerButton},
diff --git a/src/session/content/mod.rs b/src/session/content/mod.rs
index 6b4fdb0b..6f055e9e 100644
--- a/src/session/content/mod.rs
+++ b/src/session/content/mod.rs
@@ -6,7 +6,7 @@ mod room_history;
 pub mod verification;
 
 use adw::subclass::prelude::*;
-use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gio, glib, glib::clone, prelude::*, CompositeTemplate};
 
 use self::{
     explore::Explore, invite::Invite, markdown_popover::MarkdownPopover, room_details::RoomDetails,
diff --git a/src/session/content/room_details/invite_subpage/mod.rs b/src/session/content/room_details/invite_subpage/mod.rs
index 5aa19964..ca3e8c84 100644
--- a/src/session/content/room_details/invite_subpage/mod.rs
+++ b/src/session/content/room_details/invite_subpage/mod.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 
 mod invitee;
 use self::invitee::Invitee;
diff --git a/src/session/content/room_details/member_page/mod.rs b/src/session/content/room_details/member_page/mod.rs
index c85a5b28..795a287a 100644
--- a/src/session/content/room_details/member_page/mod.rs
+++ b/src/session/content/room_details/member_page/mod.rs
@@ -1,7 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     glib::{self, clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;
diff --git a/src/session/content/room_details/mod.rs b/src/session/content/room_details/mod.rs
index c49445c3..9fc0e990 100644
--- a/src/session/content/room_details/mod.rs
+++ b/src/session/content/room_details/mod.rs
@@ -6,7 +6,6 @@ use gettextrs::gettext;
 use gtk::{
     gdk,
     glib::{self, clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use matrix_sdk::ruma::events::RoomEventType;
diff --git a/src/session/content/room_history/divider_row.rs b/src/session/content/room_history/divider_row.rs
index f4bc8f11..44131ced 100644
--- a/src/session/content/room_history/divider_row.rs
+++ b/src/session/content/room_history/divider_row.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use glib::subclass::InitializingObject;
diff --git a/src/session/content/room_history/item_row.rs b/src/session/content/room_history/item_row.rs
index 62c14019..cd32f29e 100644
--- a/src/session/content/room_history/item_row.rs
+++ b/src/session/content/room_history/item_row.rs
@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{gio, glib, glib::clone, subclass::prelude::*};
+use gtk::{gio, glib, glib::clone};
 use matrix_sdk::ruma::events::AnySyncRoomEvent;
 
 use crate::{
diff --git a/src/session/content/room_history/message_row/audio.rs b/src/session/content/room_history/message_row/audio.rs
index acc31d4a..c3dc5d0a 100644
--- a/src/session/content/room_history/message_row/audio.rs
+++ b/src/session/content/room_history/message_row/audio.rs
@@ -3,7 +3,6 @@ use gettextrs::gettext;
 use gtk::{
     gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;
diff --git a/src/session/content/room_history/message_row/file.rs b/src/session/content/room_history/message_row/file.rs
index 4211516d..b27110f3 100644
--- a/src/session/content/room_history/message_row/file.rs
+++ b/src/session/content/room_history/message_row/file.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 mod imp {
     use std::cell::{Cell, RefCell};
diff --git a/src/session/content/room_history/message_row/location.rs b/src/session/content/room_history/message_row/location.rs
index 4b1b1039..12dc03cf 100644
--- a/src/session/content/room_history/message_row/location.rs
+++ b/src/session/content/room_history/message_row/location.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 
 use crate::components::LocationViewer;
 
diff --git a/src/session/content/room_history/message_row/media.rs b/src/session/content/room_history/message_row/media.rs
index 3a032dfc..d2f907fc 100644
--- a/src/session/content/room_history/message_row/media.rs
+++ b/src/session/content/room_history/message_row/media.rs
@@ -3,7 +3,6 @@ use gettextrs::gettext;
 use gtk::{
     gdk, gio,
     glib::{self, clone},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;
diff --git a/src/session/content/room_history/message_row/mod.rs b/src/session/content/room_history/message_row/mod.rs
index b2d30f6c..2804a401 100644
--- a/src/session/content/room_history/message_row/mod.rs
+++ b/src/session/content/room_history/message_row/mod.rs
@@ -12,7 +12,6 @@ use gettextrs::gettext;
 use gtk::{
     glib,
     glib::{clone, signal::SignalHandlerId},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;
diff --git a/src/session/content/room_history/message_row/reaction.rs b/src/session/content/room_history/message_row/reaction.rs
index f01969f0..b67e54c2 100644
--- a/src/session/content/room_history/message_row/reaction.rs
+++ b/src/session/content/room_history/message_row/reaction.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use crate::session::room::ReactionGroup;
 
diff --git a/src/session/content/room_history/message_row/reaction_list.rs b/src/session/content/room_history/message_row/reaction_list.rs
index a9d4e35e..f8c31a85 100644
--- a/src/session/content/room_history/message_row/reaction_list.rs
+++ b/src/session/content/room_history/message_row/reaction_list.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 
 use super::reaction::MessageReaction;
 use crate::session::room::ReactionList;
diff --git a/src/session/content/room_history/message_row/reply.rs b/src/session/content/room_history/message_row/reply.rs
index 0ae21603..fea2f0b0 100644
--- a/src/session/content/room_history/message_row/reply.rs
+++ b/src/session/content/room_history/message_row/reply.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 
 use crate::{components::Pill, session::User};
 
diff --git a/src/session/content/room_history/message_row/text.rs b/src/session/content/room_history/message_row/text.rs
index 05d37987..7b067e88 100644
--- a/src/session/content/room_history/message_row/text.rs
+++ b/src/session/content/room_history/message_row/text.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::BinExt, subclass::prelude::*};
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use gtk::{glib, prelude::*};
 use html2pango::{
     block::{markup_html, HtmlBlock},
     html_escape, markup_links,
diff --git a/src/session/content/room_history/mod.rs b/src/session/content/room_history/mod.rs
index d84affae..d2d0ca33 100644
--- a/src/session/content/room_history/mod.rs
+++ b/src/session/content/room_history/mod.rs
@@ -18,7 +18,6 @@ use gtk::{
     gdk, gio, glib,
     glib::{clone, signal::Inhibit},
     prelude::*,
-    subclass::prelude::*,
     CompositeTemplate,
 };
 use log::warn;
diff --git a/src/session/content/room_history/state_row/creation.rs b/src/session/content/room_history/state_row/creation.rs
index afcf56dc..54b55403 100644
--- a/src/session/content/room_history/state_row/creation.rs
+++ b/src/session/content/room_history/state_row/creation.rs
@@ -1,6 +1,6 @@
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use matrix_sdk::ruma::events::room::create::RoomCreateEventContent;
 
 mod imp {
diff --git a/src/session/content/room_history/state_row/mod.rs b/src/session/content/room_history/state_row/mod.rs
index 63e9d903..bfd4e0dd 100644
--- a/src/session/content/room_history/state_row/mod.rs
+++ b/src/session/content/room_history/state_row/mod.rs
@@ -3,7 +3,7 @@ mod tombstone;
 
 use adw::{prelude::*, subclass::prelude::*};
 use gettextrs::gettext;
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use log::warn;
 use matrix_sdk::ruma::events::{room::member::MembershipState, AnySyncStateEvent, SyncStateEvent};
 
diff --git a/src/session/content/room_history/state_row/tombstone.rs b/src/session/content/room_history/state_row/tombstone.rs
index f38ef0da..eacae898 100644
--- a/src/session/content/room_history/state_row/tombstone.rs
+++ b/src/session/content/room_history/state_row/tombstone.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{glib, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, CompositeTemplate};
 use matrix_sdk::ruma::events::room::tombstone::RoomTombstoneEventContent;
 
 mod imp {
diff --git a/src/session/content/room_history/verification_info_bar.rs b/src/session/content/room_history/verification_info_bar.rs
index 43b0b2e5..58b86fd8 100644
--- a/src/session/content/room_history/verification_info_bar.rs
+++ b/src/session/content/room_history/verification_info_bar.rs
@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 
 use crate::{
     gettext_f,
diff --git a/src/session/content/verification/emoji.rs b/src/session/content/verification/emoji.rs
index f4504e4e..74f2add2 100644
--- a/src/session/content/verification/emoji.rs
+++ b/src/session/content/verification/emoji.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use matrix_sdk::encryption::verification::Emoji as MatrixEmoji;
 mod imp {
     use glib::subclass::InitializingObject;
diff --git a/src/session/content/verification/identity_verification_widget.rs b/src/session/content/verification/identity_verification_widget.rs
index d9e95546..8a7f73ca 100644
--- a/src/session/content/verification/identity_verification_widget.rs
+++ b/src/session/content/verification/identity_verification_widget.rs
@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::warn;
 use matrix_sdk::encryption::verification::QrVerificationData;
 
diff --git a/src/session/content/verification/session_verification.rs b/src/session/content/verification/session_verification.rs
index dcc970e9..9f9ef4ff 100644
--- a/src/session/content/verification/session_verification.rs
+++ b/src/session/content/verification/session_verification.rs
@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, glib::clone, prelude::*, CompositeTemplate};
 use log::{debug, error};
 
 use super::IdentityVerificationWidget;
diff --git a/src/session/event_source_dialog.rs b/src/session/event_source_dialog.rs
index 2901d9b9..f0e3bbb3 100644
--- a/src/session/event_source_dialog.rs
+++ b/src/session/event_source_dialog.rs
@@ -1,5 +1,5 @@
 use adw::subclass::prelude::*;
-use gtk::{glib, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{glib, prelude::*, CompositeTemplate};
 use sourceview::prelude::*;
 
 use crate::session::room::Event;
diff --git a/src/session/media_viewer.rs b/src/session/media_viewer.rs
index a9b8969a..4a5bdce3 100644
--- a/src/session/media_viewer.rs
+++ b/src/session/media_viewer.rs
@@ -1,5 +1,5 @@
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{gdk, gio, glib, glib::clone, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, gio, glib, glib::clone, CompositeTemplate};
 use log::warn;
 use matrix_sdk::ruma::events::{room::message::MessageType, AnyMessageLikeEventContent};
 
diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs
index 49a34cfa..e7fb83d7 100644
--- a/src/session/room_creation/mod.rs
+++ b/src/session/room_creation/mod.rs
@@ -1,6 +1,6 @@
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
-use gtk::{gdk, glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
+use gtk::{gdk, glib, glib::clone, prelude::*, CompositeTemplate};
 use log::error;
 use matrix_sdk::{
     ruma::{
diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs
index 3686e77c..fbca517c 100644
--- a/src/session/sidebar/mod.rs
+++ b/src/session/sidebar/mod.rs
@@ -15,7 +15,6 @@ use adw::{prelude::*, subclass::prelude::*};
 use gtk::{
     gio, glib,
     glib::{clone, closure},
-    subclass::prelude::*,
     CompositeTemplate,
 };
 
diff --git a/src/session/sidebar/row.rs b/src/session/sidebar/row.rs
index 1323bb3f..569b9a54 100644
--- a/src/session/sidebar/row.rs
+++ b/src/session/sidebar/row.rs
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 
 use adw::{prelude::*, subclass::prelude::*};
-use gtk::{gdk, glib, glib::clone, subclass::prelude::*};
+use gtk::{gdk, glib, glib::clone};
 
 use super::EntryType;
 use crate::session::{