chore: Update to gtk-rs 0.15

Author: ids1024

Cargo.lock

@@ -12,14 +12,10 @@ members = [ "tools", "ffi", "backend", "widgets" ]
 cascade = "1"
 cairo-rs = "0.14.0"
 futures = "0.3.13"
-gdk = "0.14.0"
-gio = "0.14.0"
-glib = "0.14.0"
-gtk = { version = "0.14.0", features = ["v3_22"] }
+gtk = { version = "0.15.0", features = ["v3_22"] }
 libc = "0.2"
 once_cell = "1.4"
-pango = "0.14.0"
-pangocairo = "0.14.0"
+pangocairo = "0.15.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 log = "0.4.0"

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 cascade = "1"
 futures = "0.3.13"
 futures-timer = "3.0.2"
-glib = "0.14.0"
+glib = "0.15.0"
 hidapi = { version = "1.2", default-features = false, features = ["linux-shared-hidraw"] }
 libc = "0.2"
 once_cell = "1.4"

backend/Cargo.toml

@@ -64,20 +64,20 @@ impl Backend {
             clone!(@weak self_ => move |response| {
                 match response {
                     ThreadResponse::BoardLoading => {
-                        self_.emit_by_name("board-loading", &[]).unwrap();
+                        self_.emit_by_name::<()>("board-loading", &[]);
                     },
                     ThreadResponse::BoardLoadingDone => {
-                        self_.emit_by_name("board-loading-done", &[]).unwrap();
+                        self_.emit_by_name::<()>("board-loading-done", &[]);
                     },
                     ThreadResponse::BoardAdded(board) => {
-                        self_.emit_by_name("board-added", &[&board]).unwrap();
+                        self_.emit_by_name::<()>("board-added", &[&board]);
                         self_.inner().boards.borrow_mut().insert(board.board(), board);
                     },
                     ThreadResponse::BoardRemoved(id) => {
                         let boards = self_.inner().boards.borrow();
                         let board = &boards[&id];
-                        self_.emit_by_name("board-removed", &[board]).unwrap();
-                        board.emit_by_name("removed", &[]).unwrap();
+                        self_.emit_by_name::<()>("board-removed", &[board]);
+                        board.emit_by_name::<()>("removed", &[]);
                     },
                 }
             }),
@@ -131,31 +131,27 @@ impl Backend {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub fn connect_board_loading_done<F: Fn() + 'static>(&self, cb: F) -> SignalHandlerId {
         self.connect_local("board-loading-done", false, move |_values| {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub fn connect_board_added<F: Fn(Board) + 'static>(&self, cb: F) -> SignalHandlerId {
         self.connect_local("board-added", false, move |values| {
             cb(values[1].get::<Board>().unwrap());
             None
         })
-        .unwrap()
     }
 
     pub fn connect_board_removed<F: Fn(Board) + 'static>(&self, cb: F) -> SignalHandlerId {
         self.connect_local("board-removed", false, move |values| {
             cb(values[1].get::<Board>().unwrap());
             None
         })
-        .unwrap()
     }
 }
 

backend/src/backend.rs

@@ -130,7 +130,7 @@ impl Board {
         glib::MainContext::default().spawn(clone!(@strong self_ => async move {
             while let Some(matrix) = matrix_reciever.next().await {
                 self_.inner().matrix.replace(matrix);
-                self_.emit_by_name("matrix-changed", &[]).unwrap();
+                self_.emit_by_name::<()>("matrix-changed", &[]);
             }
         }));
 
@@ -146,28 +146,25 @@ impl Board {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub fn connect_keymap_changed<F: Fn() + 'static>(&self, cb: F) -> SignalHandlerId {
         self.connect_local("keymap-changed", false, move |_| {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub(crate) fn set_leds_changed(&self) {
         self.inner().leds_changed.set(true);
-        self.emit_by_name("leds-changed", &[]).unwrap();
+        self.emit_by_name::<()>("leds-changed", &[]);
     }
 
     pub fn connect_leds_changed<F: Fn() + 'static>(&self, cb: F) -> SignalHandlerId {
         self.connect_local("leds-changed", false, move |_| {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub fn board(&self) -> BoardId {
@@ -195,7 +192,6 @@ impl Board {
             cb();
             None
         })
-        .unwrap()
     }
 
     pub fn max_brightness(&self) -> i32 {

backend/src/board.rs

@@ -15,13 +15,13 @@ type PaletteLinSrgb = palette::LinSrgb<f64>;
     Deserialize,
     Default,
     PartialEq,
-    glib::GBoxed,
+    glib::Boxed,
     Hash,
     Eq,
     Ord,
     PartialOrd,
 )]
-#[gboxed(type_name = "S76Hs")]
+#[boxed_type(name = "S76Hs")]
 pub struct Hs {
     /// Hue, in radians
     pub h: NotNan<f64>,
@@ -56,8 +56,8 @@ impl Hs {
 }
 
 /// Integer RGB color
-#[derive(Clone, Copy, Debug, Default, glib::GBoxed)]
-#[gboxed(type_name = "S76Rgb")]
+#[derive(Clone, Copy, Debug, Default, glib::Boxed)]
+#[boxed_type(name = "S76Rgb")]
 pub struct Rgb {
     /// Red
     pub r: u8,

backend/src/color.rs

@@ -170,7 +170,7 @@ impl Key {
             )
             .await?;
         self.scancodes[layer].set(scancode);
-        board.emit_by_name("keymap-changed", &[]).unwrap();
+        board.emit_by_name::<()>("keymap-changed", &[]);
         Ok(())
     }
 }

backend/src/key.rs

@@ -9,7 +9,5 @@ name = "system76_keyboard_configurator"
 crate-type = [ "cdylib" ]
 
 [dependencies]
-glib = "0.14.0"
-gtk-sys = "0.14.0"
-gtk = "0.14.0"
+gtk = "0.15.0"
 system76-keyboard-configurator-widgets = { path = "../widgets" }

ffi/Cargo.toml

@@ -1,9 +1,9 @@
-use glib::object::ObjectType;
+use gtk::glib::object::ObjectType;
 use std::mem;
 use system76_keyboard_configurator_widgets::keyboard_backlight_widget;
 
 #[no_mangle]
-pub extern "C" fn pop_keyboard_backlight_widget() -> *mut gtk_sys::GtkWidget {
+pub extern "C" fn pop_keyboard_backlight_widget() -> *mut gtk::ffi::GtkWidget {
     unsafe {
         gtk::set_initialized();
     }

ffi/src/lib.rs

@@ -1 +1 @@
-1.51.0
+1.58.0