Update glib and gio to 0.19 (#15)

Drive-by: Remove test print statement
mathieu-lemay · Mar 5, 2024 · 801b857 · 801b857
1 parent 0020236
commit 801b857
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/f1-telemetry-display/Cargo.toml b/f1-telemetry-display/Cargo.toml
@@ -18,8 +18,8 @@ simplelog = "0.12.0"
 time = "0.3.11"
 ncurses = { version = "5.101", features = ["wide"] }
 gtk = "0.18.1"
-gio = "0.18.2"
-glib = "0.18.2"
+gio = "0.19.2"
+glib = "0.19.2"
 gdk = "0.18.0"
 cairo-rs = { version = "0.18.2", features = ["png"] }
 async-channel = "2.2.0"
diff --git a/f1-telemetry-display/src/ui/gtk.rs b/f1-telemetry-display/src/ui/gtk.rs
@@ -4,7 +4,6 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 use async_trait::async_trait;
-use gio::prelude::*;
 use glib::MainContext;
 use gtk::prelude::*;
 
@@ -84,7 +83,6 @@ impl Ui for GtkUi {
 
             let main_context = MainContext::default();
             main_context.spawn_local(async move {
-                println!("IN SPAWN");
                 while let Ok(packet) = rx.recv().await {
                     process_packet(&game_state, &widgets, &packet);
                 }

diff --git a/f1-telemetry-display/src/ui/gtk/lap_times.rs b/f1-telemetry-display/src/ui/gtk/lap_times.rs
@@ -1,4 +1,4 @@
-use gio::prelude::*;
+use gtk::cairo::glib::Type;
 use gtk::prelude::*;
 use gtk::{SortColumn, SortType, Widget};
 
@@ -183,15 +183,15 @@ fn get_team_color(team: &Team) -> String {
 
 fn create_model() -> gtk::TreeStore {
     let col_types = [
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::STRING,
-        glib::Type::I8,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::STRING,
+        Type::I8,
     ];
 
     let model = gtk::TreeStore::new(&col_types);