Fix

Author: songww

Cargo.toml

@@ -44,12 +44,12 @@ tokio = { version = "1", features = [
 tokio-util = { version = "0.7", features = ["compat"] }
 
 [dependencies.relm4]
-git = "https://github.com/songww/Relm4"
+git = "https://github.com/Relm4/Relm4"
 branch = "next"
 # path = "./relm/relm4"
-package = "relm4"
 # version = "0.6.0-alpha.1"
-features = ["gnome_43", "libadwaita", "macros"]
+package = "relm4"
+features = ["libadwaita", "macros"]
 
 # [dependencies.relm-macros]
 # git = "https://github.com/Relm4/Relm4"

src/app.rs

@@ -256,7 +256,7 @@ impl App {
         im_context.connect_commit(gtk::glib::clone!(@strong messager_sender as sender => move |ctx, text| {
             debug!("im-context({}) commit '{}'", ctx.context_id(), text);
             sender
-                .send(UiCommand::Serial(SerialCommand::Keyboard(text.replace("<", "<lt>"))).into());
+                .send(UiCommand::Serial(SerialCommand::Keyboard(text.replace("<", "<lt>")))).unwrap();
         }));
 
         main_window.set_focus_widget(Some(overlays));

src/factory.rs

@@ -66,7 +66,7 @@ impl<C: FactoryComponent> Factory<C> {
             components,
             parent_sender: parent_sender.clone(),
         };
-        base.into_iter().map(|(k, init)| {
+        base.into_iter().for_each(|(k, init)| {
             factory.insert(k, init);
         });
         factory

src/main.rs

@@ -101,6 +101,7 @@ fn main() {
     let app = Opts::command().allow_missing_positional(true);
     let title = app.get_bin_name().unwrap_or("rv");
     opts.title = title.to_string();
+
     trace!("opts: {:?}", opts);
     // let model = app::AppModel::new(opts);
     let relm =

src/vimview/widgets.rs

@@ -287,7 +287,7 @@ impl FactoryComponent for VimGrid {
         );
         click_listener.connect_released(
             glib::clone!(@strong sender, @weak self.dragging as dragging, @weak self.metrics as metrics => move |c, n_press, x, y| {
-                sender.command_sender().send(app::AppMessage::ShowPointer);
+                sender.command_sender().send(app::AppMessage::ShowPointer).unwrap();
                 let metrics = metrics.get();
                 let width = metrics.width();
                 let height = metrics.height();
@@ -322,7 +322,7 @@ impl FactoryComponent for VimGrid {
             app::GridActived.store(grid_id, atomic::Ordering::Relaxed);
         });
         motion_listener.connect_motion(glib::clone!(@strong sender, @weak self.dragging as dragging, @weak self.metrics as metrics => move |c, x, y| {
-            sender.command_sender().send(app::AppMessage::ShowPointer);
+            sender.command_sender().send(app::AppMessage::ShowPointer).unwrap();
             trace!("cursor motion {} {}", x, y);
             if let Some(Dragging { btn, pos }) = dragging.get() {
                 let metrics = metrics.get();