diff --git a/src/greeter.rs b/src/greeter.rs index b5d24b7..01ebad1 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -279,8 +279,6 @@ pub fn main() -> Result<(), Box> { sessions }; - let logind_available = cfg!(feature = "logind") && crate::logind::is_available(); - let flags = Flags { user_icons: user_datas .iter_mut() @@ -290,7 +288,10 @@ pub fn main() -> Result<(), Box> { sessions, greeter_config, greeter_config_handler, - logind_available, + #[cfg(feature = "logind")] + logind_available: crate::logind::is_available(), + #[cfg(not(feature = "logind"))] + logind_available: false, }; let settings = Settings::default().no_main_window(true); diff --git a/src/locker.rs b/src/locker.rs index c59e38e..74d0273 100644 --- a/src/locker.rs +++ b/src/locker.rs @@ -79,8 +79,6 @@ pub fn main(user: pwd::Passwd) -> Result<(), Box> { // We are already the user at this point user_data.load_config_as_user(); - let logind_available = cfg!(feature = "logind") && crate::logind::is_available(); - let flags = Flags { user_icon: user_data .icon_opt @@ -88,7 +86,10 @@ pub fn main(user: pwd::Passwd) -> Result<(), Box> { .map(widget::image::Handle::from_bytes), user_data, lockfile_opt: lockfile_opt(), - logind_available, + #[cfg(feature = "logind")] + logind_available: crate::logind::is_available(), + #[cfg(not(feature = "logind"))] + logind_available: false, }; let settings = Settings::default().no_main_window(true); @@ -1226,7 +1227,8 @@ impl cosmic::Application for App { }), ); - if cfg!(feature = "logind") && self.flags.logind_available { + #[cfg(feature = "logind")] + if self.flags.logind_available { subscriptions.push(crate::logind::subscription()); }