leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9 from pop-os/iced

Browse source 
refactor: iced
This commit is contained in:
Ashley Wulber 2022-11-28 10:58:26 -05:00 • committed by GitHub
commit 8410f8d788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/control vendored
View file

@ -18,7 +18,8 @@ Depends:
cosmic-comp,
cosmic-panel,
cosmic-bg,
cosmic-applet-host,
cosmic-app-library,
cosmic-launcher,
cosmic-applets,
cosmic-osd,
cosmic-settings-daemon,

32
src/main.rs
View file

@ -87,13 +87,13 @@ async fn main() -> Result<()> {
.await
.expect("failed to start panel");
let span = info_span!(parent: None, "cosmic-applet-host");
let span = info_span!(parent: None, "cosmic-app-library");
let stdout_span = span.clone();
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable("cosmic-applet-host")
.with_executable("cosmic-app-library")
.with_env(env_vars.clone())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
@ -111,7 +111,33 @@ async fn main() -> Result<()> {
}),
)
.await
.expect("failed to start applet host");
.expect("failed to start app library");
let span = info_span!(parent: None, "cosmic-launcher");
let stdout_span = span.clone();
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable("cosmic-launcher")
.with_env(env_vars.clone())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect("failed to start launcher");
let span = info_span!(parent: None, "cosmic-bg");
let stdout_span = span.clone();