fix build

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-07-29 16:09:10 +08:00
parent 19c8ba719a
commit d761d2f00e
3 changed files with 6 additions and 6 deletions

@ -90,7 +90,6 @@ pub const LOGIN_MSG_PASSWORD_EMPTY: &str = "Empty Password";
pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password"; pub const LOGIN_MSG_PASSWORD_WRONG: &str = "Wrong Password";
pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access"; pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
pub const LOGIN_MSG_OFFLINE: &str = "Offline"; pub const LOGIN_MSG_OFFLINE: &str = "Offline";
#[cfg(target_os = "linux")]
pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported"; pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported";
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version."; pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";

@ -614,10 +614,10 @@ pub fn main_get_error() -> String {
get_error() get_error()
} }
pub fn main_show_option(key: String) -> SyncReturn<bool> { pub fn main_show_option(_key: String) -> SyncReturn<bool> {
if key.eq(config::CONFIG_OPTION_ALLOW_LINUX_HEADLESS) { #[cfg(all(target_os = "linux", feature = "linux_headless"))]
#[cfg(all(target_os = "linux", feature = "linux_headless"))] #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
#[cfg(not(any(feature = "flatpak", feature = "appimage")))] if _key.eq(config::CONFIG_OPTION_ALLOW_LINUX_HEADLESS) {
return SyncReturn(true) return SyncReturn(true)
} }
SyncReturn(false) SyncReturn(false)

@ -2391,10 +2391,11 @@ async fn start_ipc(
args.push("--hide"); args.push("--hide");
}; };
#[cfg(target_os = "linux")]
#[cfg(any( #[cfg(any(
feature = "flatpak", feature = "flatpak",
feature = "appimage", feature = "appimage",
not(all(target_os = "linux", feature = "linux_headless")) not(feature = "linux_headless")
))] ))]
let user = None; let user = None;
#[cfg(all(target_os = "linux", feature = "linux_headless"))] #[cfg(all(target_os = "linux", feature = "linux_headless"))]