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

dbus: Remove unused return value from dbus::init

Browse source 
If we don't use this anyway, this can make things simpler.
This commit is contained in:
Ian Douglas Scott 2026-02-13 12:59:26 -08:00 • committed by Victoria Brekenfeld
parent 571565c28e
commit c8d9ff1215
1 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/dbus/mod.rs
View file

@ -3,7 +3,7 @@ use crate::{
utils::prelude::OutputExt, utils::prelude::OutputExt,
}; };
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use calloop::{InsertError, LoopHandle, RegistrationToken, stream::StreamSource}; use calloop::{InsertError, LoopHandle, stream::StreamSource};
use cosmic_comp_config::output::comp::OutputState; use cosmic_comp_config::output::comp::OutputState;
use futures_executor::block_on; use futures_executor::block_on;
use std::collections::HashMap; use std::collections::HashMap;
@ -16,54 +16,48 @@ pub mod logind;
mod name_owners; mod name_owners;
mod power; mod power;
pub fn init(evlh: &LoopHandle<'static, State>) -> Result<Vec<RegistrationToken>> { pub fn init(evlh: &LoopHandle<'static, State>) -> Result<()> {
let mut tokens = Vec::new();
match block_on(power::init()) { match block_on(power::init()) {
Ok(power_daemon) => { Ok(power_daemon) => {
if let Ok(stream) = block_on(power_daemon.receive_hot_plug_detect()) { if let Ok(stream) = block_on(power_daemon.receive_hot_plug_detect()) {
let source = StreamSource::new(stream).unwrap(); let source = StreamSource::new(stream).unwrap();
let token = evlh evlh.insert_source(source, |_, _, state| {
.insert_source(source, |_, _, state| { let nodes = match &mut state.backend {
let nodes = match &mut state.backend { BackendData::Kms(kms) => {
BackendData::Kms(kms) => { kms.drm_devices.keys().cloned().collect::<Vec<_>>()
kms.drm_devices.keys().cloned().collect::<Vec<_>>() }
} _ => Vec::new(),
_ => Vec::new(), };
}; let mut added = Vec::new();
let mut added = Vec::new(); for node in nodes {
for node in nodes { match state.device_changed(node.dev_id()) {
match state.device_changed(node.dev_id()) { Ok(outputs) => added.extend(outputs),
Ok(outputs) => added.extend(outputs), Err(err) => {
Err(err) => { tracing::error!(?err, "Failed to update drm device {}.", node)
tracing::error!(?err, "Failed to update drm device {}.", node)
}
} }
} }
if let Err(err) = state.refresh_output_config() { }
warn!("Unable to load output config: {}", err); if let Err(err) = state.refresh_output_config() {
if !added.is_empty() { warn!("Unable to load output config: {}", err);
for output in added { if !added.is_empty() {
output.config_mut().enabled = OutputState::Disabled; for output in added {
} output.config_mut().enabled = OutputState::Disabled;
if let Err(err) = state.refresh_output_config() { }
error!("Unrecoverable config error: {}", err); if let Err(err) = state.refresh_output_config() {
} error!("Unrecoverable config error: {}", err);
} }
} }
}) }
.map_err(|InsertError { error, .. }| error) })
.with_context(|| "Failed to add channel to event_loop")?; .map_err(|InsertError { error, .. }| error)
.with_context(|| "Failed to add channel to event_loop")?;
tokens.push(token);
} }
} }
Err(err) => { Err(err) => {
tracing::info!(?err, "Failed to connect to com.system76.PowerDaemon"); tracing::info!(?err, "Failed to connect to com.system76.PowerDaemon");
} }
}; };
Ok(())
Ok(tokens)
} }
/// Updated the D-Bus activation environment with `WAYLAND_DISPLAY` and /// Updated the D-Bus activation environment with `WAYLAND_DISPLAY` and