From c7511a0a46dbb17ed928daee9252fec6980cd6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Sun, 17 Dec 2023 23:06:59 +0100
Subject: [PATCH] user-page: Port to glib::Properties macro

---
 src/session/view/user_page.rs | 104 ++++++++++++----------------------
 1 file changed, 36 insertions(+), 68 deletions(-)

diff --git a/src/session/view/user_page.rs b/src/session/view/user_page.rs
index 47112466..b9187a8a 100644
--- a/src/session/view/user_page.rs
+++ b/src/session/view/user_page.rs
@@ -18,8 +18,9 @@ mod imp {
 
     use super::*;
 
-    #[derive(Debug, Default, CompositeTemplate)]
+    #[derive(Debug, Default, CompositeTemplate, glib::Properties)]
     #[template(resource = "/org/gnome/Fractal/ui/session/view/user_page.ui")]
+    #[properties(wrapper_type = super::UserPage)]
     pub struct UserPage {
         #[template_child]
         pub avatar: TemplateChild<Avatar>,
@@ -32,6 +33,7 @@ mod imp {
         #[template_child]
         pub verify_button: TemplateChild<SpinnerButton>,
         /// The current user.
+        #[property(get, set = Self::set_user, construct_only)]
         pub user: BoundObject<User>,
         pub bindings: RefCell<Vec<glib::Binding>>,
     }
@@ -63,32 +65,8 @@ mod imp {
         }
     }
 
+    #[glib::derived_properties]
     impl ObjectImpl for UserPage {
-        fn properties() -> &'static [glib::ParamSpec] {
-            use once_cell::sync::Lazy;
-            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
-                vec![glib::ParamSpecObject::builder::<User>("user")
-                    .construct_only()
-                    .build()]
-            });
-
-            PROPERTIES.as_ref()
-        }
-
-        fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
-            match pspec.name() {
-                "user" => self.obj().set_user(value.get().unwrap()),
-                _ => unimplemented!(),
-            }
-        }
-
-        fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-            match pspec.name() {
-                "user" => self.obj().user().to_value(),
-                _ => unimplemented!(),
-            }
-        }
-
         fn dispose(&self) {
             for binding in self.bindings.take() {
                 binding.unbind();
@@ -98,6 +76,38 @@ mod imp {
 
     impl WidgetImpl for UserPage {}
     impl NavigationPageImpl for UserPage {}
+
+    impl UserPage {
+        /// Set the current user.
+        fn set_user(&self, user: User) {
+            let obj = self.obj();
+
+            let title_binding = user
+                .bind_property("display-name", &*obj, "title")
+                .sync_create()
+                .build();
+            let avatar_binding = user
+                .bind_property("avatar-data", &*self.avatar, "data")
+                .sync_create()
+                .build();
+            self.bindings.replace(vec![title_binding, avatar_binding]);
+
+            let is_verified_handler = user.connect_verified_notify(clone!(@weak obj => move |_| {
+                obj.update_verified();
+            }));
+
+            // We don't need to listen to changes of the property, it never changes after
+            // construction.
+            self.direct_chat_button.set_visible(!user.is_own_user());
+
+            self.user.set(user, vec![is_verified_handler]);
+
+            spawn!(clone!(@weak obj => async move {
+                obj.load_direct_chat().await;
+            }));
+            obj.update_verified();
+        }
+    }
 }
 
 glib::wrapper! {
@@ -112,48 +122,6 @@ impl UserPage {
         glib::Object::builder().property("user", user).build()
     }
 
-    /// The current user.
-    pub fn user(&self) -> Option<User> {
-        self.imp().user.obj()
-    }
-
-    /// Set the current user.
-    fn set_user(&self, user: Option<User>) {
-        let Some(user) = user else {
-            // Ignore missing user.
-            return;
-        };
-        let imp = self.imp();
-
-        let title_binding = user
-            .bind_property("display-name", self, "title")
-            .sync_create()
-            .build();
-        let avatar_binding = user
-            .bind_property("avatar-data", &*imp.avatar, "data")
-            .sync_create()
-            .build();
-        imp.bindings.replace(vec![title_binding, avatar_binding]);
-
-        let is_verified_handler = user.connect_notify_local(
-            Some("is-verified"),
-            clone!(@weak self as obj => move |_, _| {
-                obj.update_verified();
-            }),
-        );
-
-        // We don't need to listen to changes of the property, it never changes after
-        // construction.
-        imp.direct_chat_button.set_visible(!user.is_own_user());
-
-        imp.user.set(user, vec![is_verified_handler]);
-
-        spawn!(clone!(@weak self as obj => async move {
-            obj.load_direct_chat().await;
-        }));
-        self.update_verified();
-    }
-
     /// Load whether the current user has a direct chat or not.
     async fn load_direct_chat(&self) {
         self.set_direct_chat_loading(true);