Merge branch 'master' into renovate/anyhow-1.x
This commit is contained in:
commit
1e55282b2e
1 changed files with 3 additions and 3 deletions
|
@ -11,7 +11,7 @@ use gtk::{Application, ApplicationWindow};
|
||||||
|
|
||||||
use gtk::{Button, Entry, Orientation, ScrolledWindow};
|
use gtk::{Button, Entry, Orientation, ScrolledWindow};
|
||||||
|
|
||||||
use glib;
|
use glib::{self, source::Priority, ControlFlow};
|
||||||
|
|
||||||
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(glib::PRIORITY_DEFAULT);
|
let (tx, rx) = glib::MainContext::channel(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);
|
||||||
}
|
}
|
||||||
|
|
||||||
glib::Continue(true)
|
ControlFlow::Continue
|
||||||
});
|
});
|
||||||
|
|
||||||
window.add(&master_box);
|
window.add(&master_box);
|
||||||
|
|
Loading…
Reference in a new issue