GNOME.org
 

[fractal] misc: Don't init widgets that are TemplateChild

commit 825580cc4141ad979c1c5f1d6a7d5f9b503dbc92
Author: Kévin Commaille <zecakeh tedomum fr>
Date:   Wed Sep 28 18:06:00 2022 +0200

    misc: Don't init widgets that are TemplateChild

 src/account_switcher/avatar_with_selection.rs                 |  1 -
 src/account_switcher/user_entry.rs                            |  1 -
 src/components/editable_avatar.rs                             |  1 -
 src/components/password_entry_row.rs                          |  1 -
 src/components/video_player.rs                                |  1 -
 .../account_settings/user_page/change_password_subpage.rs     |  2 --
 src/session/account_settings/user_page/mod.rs                 |  3 ---
 src/session/content/explore/public_room_row.rs                |  1 -
 src/session/content/invite.rs                                 |  2 --
 src/session/content/mod.rs                                    |  3 ---
 src/session/content/room_details/general_page/mod.rs          |  1 -
 .../room_details/member_page/members_list_view/member_row.rs  | 11 ++++++++---
 .../content/room_details/member_page/members_list_view/mod.rs |  5 -----
 src/session/content/room_details/member_page/mod.rs           |  1 -
 src/session/content/room_history/message_row/mod.rs           |  1 -
 .../content/verification/identity_verification_widget.rs      |  5 -----
 src/session/content/verification/session_verification.rs      |  1 -
 src/session/room_creation/mod.rs                              |  1 -
 18 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/src/account_switcher/avatar_with_selection.rs b/src/account_switcher/avatar_with_selection.rs
index 152c0485d..92db9bbd9 100644
--- a/src/account_switcher/avatar_with_selection.rs
+++ b/src/account_switcher/avatar_with_selection.rs
@@ -25,7 +25,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            Avatar::static_type();
             Self::bind_template(klass);
         }
 
diff --git a/src/account_switcher/user_entry.rs b/src/account_switcher/user_entry.rs
index bceb1bc9a..8647dfbeb 100644
--- a/src/account_switcher/user_entry.rs
+++ b/src/account_switcher/user_entry.rs
@@ -29,7 +29,6 @@ mod imp {
         type ParentType = gtk::ListBoxRow;
 
         fn class_init(klass: &mut Self::Class) {
-            AvatarWithSelection::static_type();
             Self::bind_template(klass);
             Self::Type::bind_template_callbacks(klass);
         }
diff --git a/src/components/editable_avatar.rs b/src/components/editable_avatar.rs
index 52b4195c2..6ad2df76c 100644
--- a/src/components/editable_avatar.rs
+++ b/src/components/editable_avatar.rs
@@ -51,7 +51,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            ActionButton::static_type();
             Self::bind_template(klass);
 
             klass.install_action("editable-avatar.edit-avatar", None, |obj, _, _| {
diff --git a/src/components/password_entry_row.rs b/src/components/password_entry_row.rs
index 048404c43..419bc4730 100644
--- a/src/components/password_entry_row.rs
+++ b/src/components/password_entry_row.rs
@@ -37,7 +37,6 @@ mod imp {
         type ParentType = adw::PreferencesRow;
 
         fn class_init(klass: &mut Self::Class) {
-            ActionButton::static_type();
             Self::bind_template(klass);
             TemplateCallbacks::bind_template_callbacks(klass);
 
diff --git a/src/components/video_player.rs b/src/components/video_player.rs
index 9fa6cc23c..0a2747427 100644
--- a/src/components/video_player.rs
+++ b/src/components/video_player.rs
@@ -35,7 +35,6 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             VideoPlayerRenderer::static_type();
-            Player::static_type();
             PlayerGMainContextSignalDispatcher::static_type();
             Self::bind_template(klass);
             Self::Type::bind_template_callbacks(klass);
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 dd2ff237e..a5bc24079 100644
--- a/src/session/account_settings/user_page/change_password_subpage.rs
+++ b/src/session/account_settings/user_page/change_password_subpage.rs
@@ -47,8 +47,6 @@ mod imp {
         type ParentType = gtk::Box;
 
         fn class_init(klass: &mut Self::Class) {
-            PasswordEntryRow::static_type();
-            SpinnerButton::static_type();
             Self::bind_template(klass);
         }
 
diff --git a/src/session/account_settings/user_page/mod.rs b/src/session/account_settings/user_page/mod.rs
index 4cf7a7f86..1647d3973 100644
--- a/src/session/account_settings/user_page/mod.rs
+++ b/src/session/account_settings/user_page/mod.rs
@@ -64,10 +64,7 @@ mod imp {
         type ParentType = adw::PreferencesPage;
 
         fn class_init(klass: &mut Self::Class) {
-            EditableAvatar::static_type();
             ButtonRow::static_type();
-            ChangePasswordSubpage::static_type();
-            DeactivateAccountSubpage::static_type();
             Self::bind_template(klass);
             Self::Type::bind_template_callbacks(klass);
             TemplateCallbacks::bind_template_callbacks(klass);
diff --git a/src/session/content/explore/public_room_row.rs b/src/session/content/explore/public_room_row.rs
index f695ae450..e824f504b 100644
--- a/src/session/content/explore/public_room_row.rs
+++ b/src/session/content/explore/public_room_row.rs
@@ -43,7 +43,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            Avatar::static_type();
             Self::bind_template(klass);
         }
 
diff --git a/src/session/content/invite.rs b/src/session/content/invite.rs
index 86a48a3fc..0306673f4 100644
--- a/src/session/content/invite.rs
+++ b/src/session/content/invite.rs
@@ -46,8 +46,6 @@ mod imp {
 
         fn class_init(klass: &mut Self::Class) {
             Pill::static_type();
-            SpinnerButton::static_type();
-            LabelWithWidgets::static_type();
             Avatar::static_type();
             Self::bind_template(klass);
             klass.set_accessible_role(gtk::AccessibleRole::Group);
diff --git a/src/session/content/mod.rs b/src/session/content/mod.rs
index fdaff61b1..c1cf234db 100644
--- a/src/session/content/mod.rs
+++ b/src/session/content/mod.rs
@@ -57,9 +57,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            RoomHistory::static_type();
-            Invite::static_type();
-            Explore::static_type();
             Self::bind_template(klass);
             klass.set_accessible_role(gtk::AccessibleRole::Group);
 
diff --git a/src/session/content/room_details/general_page/mod.rs 
b/src/session/content/room_details/general_page/mod.rs
index 061c7b9a0..acb85adc5 100644
--- a/src/session/content/room_details/general_page/mod.rs
+++ b/src/session/content/room_details/general_page/mod.rs
@@ -55,7 +55,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            CustomEntry::static_type();
             Self::bind_template(klass);
 
             klass.install_action("details.choose-avatar", None, move |widget, _, _| {
diff --git a/src/session/content/room_details/member_page/members_list_view/member_row.rs 
b/src/session/content/room_details/member_page/members_list_view/member_row.rs
index 6388e4648..94d4f6698 100644
--- a/src/session/content/room_details/member_page/members_list_view/member_row.rs
+++ b/src/session/content/room_details/member_page/members_list_view/member_row.rs
@@ -1,9 +1,12 @@
 use adw::subclass::prelude::BinImpl;
 use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
 
-use crate::session::{
-    content::room_details::{member_page::MemberMenu, MemberPage},
-    room::Member,
+use crate::{
+    components::{Avatar, Badge},
+    session::{
+        content::room_details::{member_page::MemberMenu, MemberPage},
+        room::Member,
+    },
 };
 
 mod imp {
@@ -29,6 +32,8 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
+            Avatar::static_type();
+            Badge::static_type();
             Self::bind_template(klass);
         }
 
diff --git a/src/session/content/room_details/member_page/members_list_view/mod.rs 
b/src/session/content/room_details/member_page/members_list_view/mod.rs
index 766288474..842e16138 100644
--- a/src/session/content/room_details/member_page/members_list_view/mod.rs
+++ b/src/session/content/room_details/member_page/members_list_view/mod.rs
@@ -4,8 +4,6 @@ use adw::{
 };
 use gtk::{gio, glib, CompositeTemplate};
 
-use crate::components::{Avatar, Badge};
-
 pub mod extra_lists;
 mod item_row;
 mod member_row;
@@ -38,9 +36,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            Avatar::static_type();
-            Badge::static_type();
-            MemberRow::static_type();
             ItemRow::static_type();
             Self::bind_template(klass);
         }
diff --git a/src/session/content/room_details/member_page/mod.rs 
b/src/session/content/room_details/member_page/mod.rs
index 2a58f825f..f0924a241 100644
--- a/src/session/content/room_details/member_page/mod.rs
+++ b/src/session/content/room_details/member_page/mod.rs
@@ -60,7 +60,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            MembersListView::static_type();
             Self::bind_template(klass);
 
             klass.install_action("member.verify", None, move |widget, _, _| {
diff --git a/src/session/content/room_history/message_row/mod.rs 
b/src/session/content/room_history/message_row/mod.rs
index dd1326228..73e7a74d7 100644
--- a/src/session/content/room_history/message_row/mod.rs
+++ b/src/session/content/room_history/message_row/mod.rs
@@ -54,7 +54,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            Avatar::static_type();
             Self::bind_template(klass);
         }
 
diff --git a/src/session/content/verification/identity_verification_widget.rs 
b/src/session/content/verification/identity_verification_widget.rs
index 17e35ec63..364472f67 100644
--- a/src/session/content/verification/identity_verification_widget.rs
+++ b/src/session/content/verification/identity_verification_widget.rs
@@ -102,11 +102,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            SpinnerButton::static_type();
-            QRCode::static_type();
-            Emoji::static_type();
-            QrCodeScanner::static_type();
-
             klass.install_action("verification.decline", None, move |obj, _, _| {
                 obj.decline();
             });
diff --git a/src/session/content/verification/session_verification.rs 
b/src/session/content/verification/session_verification.rs
index 313101016..3c27eec35 100644
--- a/src/session/content/verification/session_verification.rs
+++ b/src/session/content/verification/session_verification.rs
@@ -40,7 +40,6 @@ mod imp {
         type ParentType = adw::Bin;
 
         fn class_init(klass: &mut Self::Class) {
-            SpinnerButton::static_type();
             Self::bind_template(klass);
 
             klass.install_action("session-verification.previous", None, move |obj, _, _| {
diff --git a/src/session/room_creation/mod.rs b/src/session/room_creation/mod.rs
index 88f9bf9a5..91e8c3193 100644
--- a/src/session/room_creation/mod.rs
+++ b/src/session/room_creation/mod.rs
@@ -69,7 +69,6 @@ mod imp {
         type ParentType = adw::Window;
 
         fn class_init(klass: &mut Self::Class) {
-            SpinnerButton::static_type();
             Self::bind_template(klass);
 
             klass.add_binding(
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]