Compare commits

..

No commits in common. "1e55282b2e18448844375ee54d245eaf3a8a91de" and "2907ba76a302e1719858c4dab6d4bca02a8eeab5" have entirely different histories.

View file

@ -11,7 +11,7 @@ use gtk::{Application, ApplicationWindow};
use gtk::{Button, Entry, Orientation, ScrolledWindow}; use gtk::{Button, Entry, Orientation, ScrolledWindow};
use glib::{self, source::Priority, ControlFlow}; use glib;
mod port; mod port;
use port::*; use port::*;
@ -54,7 +54,7 @@ fn main() {
master_box.pack_end(&scrolled_window, true, true, 3); master_box.pack_end(&scrolled_window, true, true, 3);
master_box.pack_end(&top_bar_box, false, true, 3); master_box.pack_end(&top_bar_box, false, true, 3);
let (tx, rx) = glib::MainContext::channel(Priority::DEFAULT); let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
std::thread::spawn(move || { std::thread::spawn(move || {
// loop forever // loop forever
@ -147,7 +147,7 @@ fn main() {
serial_info.scroll_to_iter(&mut buffer.end_iter(), 0.0, true, 0.0, 0.0); serial_info.scroll_to_iter(&mut buffer.end_iter(), 0.0, true, 0.0, 0.0);
} }
ControlFlow::Continue glib::Continue(true)
}); });
window.add(&master_box); window.add(&master_box);