chore: Remove unnecessary move with install_action

2 years ago · 3f7f0cfdb2
17 changed files with 69 additions and 81 deletions
--- a/src/account_switcher/account_switcher_popover.rs
+++ b/src/account_switcher/account_switcher_popover.rs
@ -36,8 +36,8 @@ mod imp {
            Self::bind_template(klass);
            Self::Type::bind_template_callbacks(klass);

-            klass.install_action("account-switcher.close", None, move |item, _, _| {
-                item.popdown();
+            klass.install_action("account-switcher.close", None, |obj, _, _| {
+                obj.popdown();
            });
        }

--- a/src/components/context_menu_bin.rs
+++ b/src/components/context_menu_bin.rs
@ -54,8 +54,8 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action("context-menu.activate", None, move |widget, _, _| {
-                widget.open_menu_at(0, 0)
+            klass.install_action("context-menu.activate", None, |obj, _, _| {
+                obj.open_menu_at(0, 0)
            });
            klass.add_binding_action(
                gdk::Key::F10,
@ -68,8 +68,8 @@ mod imp {
                "context-menu.activate",
            );

-            klass.install_action("context-menu.close", None, move |widget, _, _| {
-                if let Some(popover) = widget.popover() {
+            klass.install_action("context-menu.close", None, |obj, _, _| {
+                if let Some(popover) = obj.popover() {
                    popover.popdown();
                }
            });
--- a/src/components/pill/mod.rs
+++ b/src/components/pill/mod.rs
@ -52,8 +52,8 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action("pill.activate", None, move |widget, _, _| {
-                widget.activate();
+            klass.install_action("pill.activate", None, |obj, _, _| {
+                obj.activate();
            });

            add_activate_binding_action(klass, "pill.activate");
--- a/src/session/view/account_settings/mod.rs
+++ b/src/session/view/account_settings/mod.rs
@ -71,12 +71,12 @@ mod imp {
            klass.install_action(
                "account-settings.show-subpage",
                Some(&AccountSettingsSubpage::static_variant_type()),
-                move |widget, _, param| {
+                |obj, _, param| {
                    let subpage = param
                        .and_then(|variant| variant.get::<AccountSettingsSubpage>())
                        .expect("The parameter should be a valid subpage name");

-                    widget.show_subpage(subpage);
+                    obj.show_subpage(subpage);
                },
            );

--- a/src/session/view/content/explore/servers_popover.rs
+++ b/src/session/view/content/explore/servers_popover.rs
@ -37,17 +37,13 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action(
-                "explore-servers-popover.add-server",
-                None,
-                move |obj, _, _| {
-                    obj.add_server();
-                },
-            );
+            klass.install_action("explore-servers-popover.add-server", None, |obj, _, _| {
+                obj.add_server();
+            });
            klass.install_action(
                "explore-servers-popover.remove-server",
                Some(&String::static_variant_type()),
-                move |obj, _, variant| {
+                |obj, _, variant| {
                    if let Some(variant) = variant.and_then(String::from_variant) {
                        obj.remove_server(&variant);
                    }
--- a/src/session/view/content/room_details/history_viewer/audio_row.rs
+++ b/src/session/view/content/room_details/history_viewer/audio_row.rs
@ -42,8 +42,8 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action("audio-row.toggle-play", None, move |widget, _, _| {
-                widget.toggle_play();
+            klass.install_action("audio-row.toggle-play", None, |obj, _, _| {
+                obj.toggle_play();
            });
        }

--- a/src/session/view/content/room_details/history_viewer/file_row.rs
+++ b/src/session/view/content/room_details/history_viewer/file_row.rs
@ -41,15 +41,11 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action_async(
-                "file-row.save-file",
-                None,
-                move |widget, _, _| async move {
-                    widget.save_file().await;
-                },
-            );
-            klass.install_action("file-row.open-file", None, move |widget, _, _| {
-                widget.open_file();
+            klass.install_action_async("file-row.save-file", None, |obj, _, _| async move {
+                obj.save_file().await;
+            });
+            klass.install_action("file-row.open-file", None, |obj, _, _| {
+                obj.open_file();
            });
        }

--- a/src/session/view/content/room_details/history_viewer/media_item.rs
+++ b/src/session/view/content/room_details/history_viewer/media_item.rs
@ -48,8 +48,8 @@ mod imp {

            klass.set_css_name("media-history-viewer-item");

-            klass.install_action("media-item.activate", None, move |widget, _, _| {
-                widget.activate();
+            klass.install_action("media-item.activate", None, |obj, _, _| {
+                obj.activate();
            });

            add_activate_binding_action(klass, "media-item.activate");
--- a/src/session/view/content/room_details/members_page/mod.rs
+++ b/src/session/view/content/room_details/members_page/mod.rs
@ -46,7 +46,7 @@ mod imp {
            klass.install_action(
                "members.show-membership-list",
                Some(&Membership::static_variant_type()),
-                move |widget, _, param| {
+                |obj, _, param| {
                    let Some(membership) = param.and_then(|variant| variant.get::<Membership>())
                    else {
                        return;
@ -59,32 +59,32 @@ mod imp {
                        _ => return,
                    };

-                    widget.imp().navigation_view.push_by_tag(subpage);
+                    obj.imp().navigation_view.push_by_tag(subpage);
                },
            );

            klass.install_action(
                "members.show-member",
                Some(&String::static_variant_type()),
-                move |widget, _, param| {
+                |obj, _, param| {
                    let Some(user_id) = param
                        .and_then(|variant| variant.get::<String>())
                        .and_then(|s| UserId::parse(s).ok())
                    else {
                        return;
                    };
-                    let Some(room) = widget.room() else {
+                    let Some(room) = obj.room() else {
                        return;
                    };

                    let member = room.get_or_create_members().get_or_create(user_id);
                    let user_page = UserPage::new(&member);
-                    user_page.connect_close(clone!(@weak widget => move |_| {
-                        let _ = widget.activate_action("navigation.pop", None);
-                        toast!(widget, gettext("The user is not in the room members list anymore"));
+                    user_page.connect_close(clone!(@weak obj => move |_| {
+                        let _ = obj.activate_action("navigation.pop", None);
+                        toast!(obj, gettext("The user is not in the room members list anymore"));
                    }));

-                    widget.imp().navigation_view.push(&user_page);
+                    obj.imp().navigation_view.push(&user_page);
                },
            );
        }
--- a/src/session/view/content/room_details/mod.rs
+++ b/src/session/view/content/room_details/mod.rs
@ -73,12 +73,12 @@ mod imp {
            klass.install_action(
                "details.show-subpage",
                Some(&String::static_variant_type()),
-                move |widget, _, param| {
+                |obj, _, param| {
                    let subpage = param
                        .and_then(|variant| variant.get::<SubpageName>())
                        .expect("The parameter should be a valid subpage name");

-                    widget.show_subpage(subpage, false);
+                    obj.show_subpage(subpage, false);
                },
            );

--- a/src/session/view/content/room_history/message_row/mod.rs
+++ b/src/session/view/content/room_history/message_row/mod.rs
@ -74,7 +74,7 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action("message-row.show-media", None, move |obj, _, _| {
+            klass.install_action("message-row.show-media", None, |obj, _, _| {
                obj.show_media();
            });
        }
--- a/src/session/view/content/room_history/mod.rs
+++ b/src/session/view/content/room_history/mod.rs
@ -145,30 +145,30 @@ mod imp {
                obj.forget().await;
            });

-            klass.install_action("room-history.try-again", None, move |widget, _, _| {
-                widget.try_again();
+            klass.install_action("room-history.try-again", None, |obj, _, _| {
+                obj.try_again();
            });

            klass.install_action_async("room-history.permalink", None, |obj, _, _| async move {
                obj.permalink().await;
            });

-            klass.install_action("room-history.details", None, move |widget, _, _| {
-                widget.open_room_details(None);
+            klass.install_action("room-history.details", None, |obj, _, _| {
+                obj.open_room_details(None);
            });
-            klass.install_action("room-history.invite-members", None, move |widget, _, _| {
-                widget.open_room_details(Some(room_details::SubpageName::Invite));
+            klass.install_action("room-history.invite-members", None, |obj, _, _| {
+                obj.open_room_details(Some(room_details::SubpageName::Invite));
            });

-            klass.install_action("room-history.scroll-down", None, move |widget, _, _| {
-                widget.scroll_down();
+            klass.install_action("room-history.scroll-down", None, |obj, _, _| {
+                obj.scroll_down();
            });
            klass.install_action(
                "room-history.scroll-to-event",
                Some(&EventKey::static_variant_type()),
-                move |widget, _, v| {
+                |obj, _, v| {
                    if let Some(event_key) = v.and_then(EventKey::from_variant) {
-                        widget.scroll_to_event(&event_key);
+                        obj.scroll_to_event(&event_key);
                    }
                },
            );
@ -176,19 +176,19 @@ mod imp {
            klass.install_action(
                "room-history.reply",
                Some(&String::static_variant_type()),
-                move |widget, _, v| {
+                |obj, _, v| {
                    if let Some(event_id) = v
                        .and_then(String::from_variant)
                        .and_then(|s| EventId::parse(s).ok())
                    {
-                        if let Some(event) = widget
+                        if let Some(event) = obj
                            .room()
                            .and_then(|room| {
                                room.timeline().event_by_key(&EventKey::EventId(event_id))
                            })
                            .and_downcast()
                        {
-                            widget.message_toolbar().set_reply_to(event);
+                            obj.message_toolbar().set_reply_to(event);
                        }
                    }
                },
@ -197,19 +197,19 @@ mod imp {
            klass.install_action(
                "room-history.edit",
                Some(&String::static_variant_type()),
-                move |widget, _, v| {
+                |obj, _, v| {
                    if let Some(event_id) = v
                        .and_then(String::from_variant)
                        .and_then(|s| EventId::parse(s).ok())
                    {
-                        if let Some(event) = widget
+                        if let Some(event) = obj
                            .room()
                            .and_then(|room| {
                                room.timeline().event_by_key(&EventKey::EventId(event_id))
                            })
                            .and_downcast()
                        {
-                            widget.message_toolbar().set_edit(event);
+                            obj.message_toolbar().set_edit(event);
                        }
                    }
                },
--- a/src/session/view/content/room_history/read_receipts_list/mod.rs
+++ b/src/session/view/content/room_history/read_receipts_list/mod.rs
@ -78,8 +78,8 @@ mod imp {
            klass.set_css_name("read-receipts-list");
            klass.set_accessible_role(gtk::AccessibleRole::ToggleButton);

-            klass.install_action("read-receipts-list.activate", None, move |widget, _, _| {
-                widget.show_popover(1, 0.0, 0.0);
+            klass.install_action("read-receipts-list.activate", None, |obj, _, _| {
+                obj.show_popover(1, 0.0, 0.0);
            });

            add_activate_binding_action(klass, "read-receipts-list.activate");
--- a/src/session/view/event_details_dialog.rs
+++ b/src/session/view/event_details_dialog.rs
@ -45,17 +45,13 @@ mod imp {
            Self::bind_template(klass);
            Self::Type::bind_template_callbacks(klass);

-            klass.install_action(
-                "event-details-dialog.copy-source",
-                None,
-                move |obj, _, _| {
-                    let clipboard = obj.clipboard();
-                    let buffer = obj.imp().source_view.buffer();
-                    let (start_iter, end_iter) = buffer.bounds();
-                    clipboard.set_text(&buffer.text(&start_iter, &end_iter, true));
-                    toast!(obj, gettext("Source copied to clipboard"))
-                },
-            );
+            klass.install_action("event-details-dialog.copy-source", None, |obj, _, _| {
+                let clipboard = obj.clipboard();
+                let buffer = obj.imp().source_view.buffer();
+                let (start_iter, end_iter) = buffer.bounds();
+                clipboard.set_text(&buffer.text(&start_iter, &end_iter, true));
+                toast!(obj, gettext("Source copied to clipboard"))
+            });
        }

        fn instance_init(obj: &InitializingObject<Self>) {
--- a/src/session/view/media_viewer.rs
+++ b/src/session/view/media_viewer.rs
@ -73,7 +73,7 @@ mod imp {

            klass.set_css_name("media-viewer");

-            klass.install_action("media-viewer.close", None, move |obj, _, _| {
+            klass.install_action("media-viewer.close", None, |obj, _, _| {
                obj.close();
            });
            klass.add_binding_action(
@ -83,7 +83,7 @@ mod imp {
            );

            // Menu actions
-            klass.install_action("media-viewer.copy-image", None, move |obj, _, _| {
+            klass.install_action("media-viewer.copy-image", None, |obj, _, _| {
                obj.copy_image();
            });

--- a/src/session/view/session_view.rs
+++ b/src/session/view/session_view.rs
@ -54,14 +54,14 @@ mod imp {
        fn class_init(klass: &mut Self::Class) {
            Self::bind_template(klass);

-            klass.install_action("session.close-room", None, move |obj, _, _| {
+            klass.install_action("session.close-room", None, |obj, _, _| {
                obj.select_room(None);
            });

            klass.install_action(
                "session.show-room",
                Some(&String::static_variant_type()),
-                move |obj, _, parameter| {
+                |obj, _, parameter| {
                    if let Ok(room_id) =
                        <&RoomId>::try_from(&*parameter.unwrap().get::<String>().unwrap())
                    {
@ -80,15 +80,15 @@ mod imp {
                }
            });

-            klass.install_action("session.show-content", None, move |obj, _, _| {
+            klass.install_action("session.show-content", None, |obj, _, _| {
                obj.show_content();
            });

-            klass.install_action("session.room-creation", None, move |obj, _, _| {
+            klass.install_action("session.room-creation", None, |obj, _, _| {
                obj.show_room_creation_dialog();
            });

-            klass.install_action("session.show-join-room", None, move |obj, _, _| {
+            klass.install_action("session.show-join-room", None, |obj, _, _| {
                obj.show_join_room_dialog(None);
            });

@ -102,7 +102,7 @@ mod imp {
                "session.close-room",
            );

-            klass.install_action("session.toggle-room-search", None, move |obj, _, _| {
+            klass.install_action("session.toggle-room-search", None, |obj, _, _| {
                obj.toggle_room_search();
            });

--- a/src/window.rs
+++ b/src/window.rs
@ -88,14 +88,14 @@ mod imp {

            klass.add_binding_action(gdk::Key::v, gdk::ModifierType::CONTROL_MASK, "win.paste");
            klass.add_binding_action(gdk::Key::Insert, gdk::ModifierType::SHIFT_MASK, "win.paste");
-            klass.install_action("win.paste", None, move |obj, _, _| {
+            klass.install_action("win.paste", None, |obj, _, _| {
                obj.imp().session.handle_paste_action();
            });

            klass.install_action(
                "win.open-account-settings",
                Some(&String::static_variant_type()),
-                move |obj, _, variant| {
+                |obj, _, variant| {
                    if let Some(session_id) = variant.and_then(|v| v.get::<String>()) {
                        obj.open_account_settings(&session_id);
                    }