Merge pull request #57 from ranfdev/update_deps

Update deps

Author: ranfdev

Cargo.lock

@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies.gtk]
 package = "gtk4"
-git = "https://github.com/gtk-rs/gtk4-rs.git"
+version = "0.6"
 features = ["v4_8"]
 
 [dependencies]
@@ -28,13 +28,4 @@ toml = "0.5.6"
 serde = { version = "1.0.116", features = ["derive"] }
 env_logger = "0.8.1"
 log = "0.4.0"
-adw = { package = "libadwaita", git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git", features = ["v1_2"]}
-
-[patch."https://github.com/gtk-rs/gtk-rs-core.git"]
-glib = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-gio = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-pango = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-glib-sys = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-gobject-sys = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-gio-sys = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
-pango-sys = {git = "https://github.com/ranfdev/gtk-rs-core.git", branch = "props_macro"}
+adw = { package = "libadwaita", version = "0.3", features = ["v1_2"]}

Cargo.toml

@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ../Cargo.lock;
-    outputHashes = {
-      "cairo-rs-0.16.0" = "sha256-cqWL8PKmakObkHZWFtfLQtMKKBfSPQNvqLFkh0JaBGY=";
-      "gdk4-0.5.0" = "sha256-ICUZ8Y/4D4iAzZosusZL2sB/EXGkWarWk5ZIW84crg4=";
-      "gio-0.16.0" = "sha256-34RcAmMozLAqrGPalGvyBdtTwurcoYs2VKtNenDOK3E=";
-      "libadwaita-0.2.0" = "sha256-47GmghKbdaK+5F7GeeMEczDqMP3X+daHY2UEhmC5Qtc=";
-    };
   };
 
   src = ../.;

flake.lock

@@ -5,7 +5,7 @@ use futures::prelude::*;
 
 #[async_trait(?Send)]
 pub trait LossyTextRead {
-    async fn read_line_lossy(&mut self, mut buf: &mut String) -> std::io::Result<usize>;
+    async fn read_line_lossy(&mut self, buf: &mut String) -> std::io::Result<usize>;
 }
 
 #[async_trait(?Send)]

nix/geopard.nix

@@ -119,5 +119,5 @@ fn main() {
     application.set_accels_for_action("win.reset-zoom", &["<Ctrl>0"]);
     // FIXME: win.view-source
     let ret = application.run();
-    std::process::exit(ret);
+    std::process::exit(ret.into());
 }

src/lossy_text_read.rs

@@ -1,4 +1,3 @@
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate, TemplateChild};
 
@@ -45,7 +44,7 @@ glib::wrapper! {
 
 impl Download {
     pub fn new() -> Self {
-        glib::Object::new(&[]).unwrap()
+        glib::Object::new()
     }
 }
 impl Default for Download {

src/main.rs

@@ -134,7 +134,7 @@ impl Surface {
         tag_table
     }
     fn create_tag(name: &str, config: &crate::config::Font) -> gtk::TextTag {
-        gtk::builders::TextTagBuilder::new()
+        gtk::TextTag::builder()
             .family(&config.family)
             .weight(config.weight)
             .name(name)
@@ -182,17 +182,11 @@ pub mod imp {
         fn properties() -> &'static [glib::ParamSpec] {
             Self::derived_properties()
         }
-        fn set_property(
-            &self,
-            obj: &Self::Type,
-            id: usize,
-            value: &glib::Value,
-            pspec: &glib::ParamSpec,
-        ) {
-            Self::derived_set_property(self, obj, id, value, pspec).unwrap()
+        fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+            Self::derived_set_property(self, id, value, pspec)
         }
-        fn property(&self, obj: &Self::Type, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-            Self::derived_property(self, obj, id, pspec).unwrap()
+        fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            Self::derived_property(self, id, pspec)
         }
         fn signals() -> &'static [glib::subclass::Signal] {
             static SIGNALS: Lazy<Vec<glib::subclass::Signal>> = Lazy::new(|| {
@@ -227,25 +221,21 @@ glib::wrapper! {
 }
 impl Default for Hypertext {
     fn default() -> Self {
-        glib::Object::new(&[]).unwrap()
+        glib::Object::new()
     }
 }
 impl Hypertext {
     pub fn new(url: String, surface: Surface) -> Self {
         let text_view = surface.text_view.clone();
 
-        let this: Self = glib::Object::new(&[]).unwrap();
+        let this: Self = glib::Object::new();
         this.imp().url.replace(url);
         this.imp().surface.replace(Some(surface));
 
         let left_click_ctrl = gtk::GestureClick::builder().button(1).build();
         let right_click_ctrl = gtk::GestureClick::builder().button(3).build();
         let motion_ctrl = gtk::EventControllerMotion::new();
 
-        text_view.add_controller(&left_click_ctrl);
-        text_view.add_controller(&right_click_ctrl);
-        text_view.add_controller(&motion_ctrl);
-
         left_click_ctrl.connect_released(
             clone!(@strong this => @default-panic, move |ctrl, _n_press, x, y| {
                 if let Err(e) = this.handle_click(ctrl, x, y) {
@@ -266,6 +256,10 @@ impl Hypertext {
             let _ = this.handle_motion(x, y);
         }));
 
+        text_view.add_controller(left_click_ctrl);
+        text_view.add_controller(right_click_ctrl);
+        text_view.add_controller(motion_ctrl);
+
         this
     }
     pub fn render<'e>(
@@ -506,7 +500,7 @@ impl Hypertext {
         };
 
         imp.hover_url.replace(link_ref.to_owned());
-        self.emit_hover_url();
+        self.notify_hover_url();
         Ok(())
     }
 }

src/widgets/pages/download.rs

@@ -1,4 +1,3 @@
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate, TemplateChild};
 
@@ -41,7 +40,7 @@ glib::wrapper! {
 
 impl Input {
     pub fn new() -> Self {
-        glib::Object::new(&[]).unwrap()
+        glib::Object::new()
     }
 }
 impl Default for Input {

src/widgets/pages/hypertext.rs

@@ -124,8 +124,8 @@ pub mod imp {
     }
 
     impl ObjectImpl for Tab {
-        fn constructed(&self, obj: &Self::Type) {
-            self.parent_constructed(obj);
+        fn constructed(&self) {
+            self.parent_constructed();
 
             self.gemini_client
                 .replace(gemini::ClientBuilder::new().redirect(true).build());
@@ -141,18 +141,12 @@ pub mod imp {
             Self::derived_properties()
         }
 
-        fn set_property(
-            &self,
-            obj: &Self::Type,
-            id: usize,
-            value: &glib::Value,
-            pspec: &glib::ParamSpec,
-        ) {
-            self.derived_set_property(obj, id, value, pspec).unwrap()
+        fn set_property(&self, id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+            self.derived_set_property(id, value, pspec)
         }
 
-        fn property(&self, obj: &Self::Type, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-            self.derived_property(obj, id, pspec).unwrap()
+        fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            self.derived_property(id, pspec)
         }
     }
     impl Tab {
@@ -174,7 +168,7 @@ glib::wrapper! {
 
 impl Tab {
     pub fn new(config: crate::config::Config) -> Self {
-        let this: Self = glib::Object::new(&[]).unwrap();
+        let this: Self = glib::Object::new();
         let imp = this.imp();
 
         imp.config.replace(config);
@@ -222,14 +216,14 @@ impl Tab {
             imp.history.borrow_mut().push(item);
         }
 
-        self.emit_history_status();
+        self.notify_history_status();
         self.log_history_position();
         imp.history.borrow().index().unwrap()
     }
     fn clear_stack_widgets(&self) {
         let imp = self.imp();
         let pages = imp.stack.pages();
-        let mut iter = pages.iter::<gtk::StackPage>().unwrap();
+        let mut iter = pages.iter::<gtk::StackPage>();
         let first_page = iter.next().unwrap().unwrap();
         imp.stack.set_visible_child(&first_page.child());
         for page in iter.skip(1) {
@@ -247,9 +241,9 @@ impl Tab {
 
         self.set_progress(0.0);
         *imp.title.borrow_mut() = url.to_string();
-        self.emit_title();
+        self.notify_title();
         *imp.url.borrow_mut() = url.to_string();
-        self.emit_url();
+        self.notify_url();
 
         let this = self.clone();
         let fut = async move {
@@ -286,13 +280,13 @@ impl Tab {
         let imp = self.imp();
 
         imp.progress.set(0.0);
-        self.emit_progress();
+        self.notify_progress();
 
         *imp.title.borrow_mut() = url.to_string();
-        self.emit_title();
+        self.notify_title();
 
         *imp.url.borrow_mut() = url.to_string();
-        self.emit_url();
+        self.notify_url();
 
         let this = self.clone();
         async move {
@@ -687,7 +681,7 @@ impl Tab {
             self.spawn_request(
                 self.open_history(self.imp().history.borrow().current().unwrap().clone()),
             );
-            self.emit_history_status();
+            self.notify_history_status();
         }
         moved
     }