leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improv: enable dbus-config by default, but only for Linux targets

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-08-20 16:09:17 +02:00 • committed by Michael Murphy
parent 6e7a634398
commit e7b7c3a126
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/cosmic.rs
View file

@ -101,7 +101,7 @@ where
pub fn init(
(mut core, flags): (Core, T::Flags),
) -> (Self, iced::Task<crate::Action<T::Message>>) {
#[cfg(feature = "dbus-config")]
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
{
use iced_futures::futures::executor::block_on;
core.settings_daemon = block_on(cosmic_config::dbus::settings_daemon_proxy()).ok();

8
src/core.rs
View file

@ -89,7 +89,7 @@ pub struct Core {
#[cfg(feature = "single-instance")]
pub(crate) single_instance: bool,
#[cfg(feature = "dbus-config")]
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
pub(crate) settings_daemon: Option<cosmic_settings_daemon::CosmicSettingsDaemonProxy<'static>>,
pub(crate) main_window: Option<window::Id>,
@ -146,7 +146,7 @@ impl Default for Core {
applet: crate::applet::Context::default(),
#[cfg(feature = "single-instance")]
single_instance: false,
#[cfg(feature = "dbus-config")]
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
settings_daemon: None,
portal_is_dark: None,
portal_accent: None,
@ -353,7 +353,7 @@ impl Core {
&self,
config_id: &'static str,
) -> iced::Subscription<cosmic_config::Update<T>> {
#[cfg(feature = "dbus-config")]
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
if let Some(settings_daemon) = self.settings_daemon.clone() {
return cosmic_config::dbus::watcher_subscription(settings_daemon, config_id, false);
}
@ -370,7 +370,7 @@ impl Core {
&self,
state_id: &'static str,
) -> iced::Subscription<cosmic_config::Update<T>> {
#[cfg(feature = "dbus-config")]
#[cfg(all(feature = "dbus-config", target_os = "linux"))]
if let Some(settings_daemon) = self.settings_daemon.clone() {
return cosmic_config::dbus::watcher_subscription(settings_daemon, state_id, true);
}

3
src/theme/mod.rs
View file

@ -18,9 +18,6 @@ use iced_runtime::{Appearance, DefaultStyle};
use std::sync::{Arc, Mutex};
pub use style::*;
#[cfg(feature = "dbus-config")]
use cosmic_config::dbus;
pub type CosmicColor = ::palette::rgb::Srgba;
pub type CosmicComponent = cosmic_theme::Component;
pub type CosmicTheme = cosmic_theme::Theme;