mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-12-16 21:16:35 +00:00
Merge remote-tracking branch 'rd/master' into feat/x11/clipboard-file/init
Signed-off-by: ClSlaid <cailue@bupt.edu.cn>
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
use hbb_common::password_security;
|
||||
use hbb_common::{
|
||||
allow_err,
|
||||
config::{self, Config, LocalConfig, PeerConfig},
|
||||
directories_next, log, tokio,
|
||||
};
|
||||
use hbb_common::{
|
||||
bytes::Bytes,
|
||||
config::{self, Config, LocalConfig, PeerConfig},
|
||||
config::{CONNECT_TIMEOUT, RENDEZVOUS_PORT},
|
||||
directories_next,
|
||||
futures::future::join_all,
|
||||
log,
|
||||
rendezvous_proto::*,
|
||||
tokio,
|
||||
};
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
use hbb_common::{
|
||||
@@ -17,9 +17,10 @@ use hbb_common::{
|
||||
tokio::{sync::mpsc, time},
|
||||
};
|
||||
use serde_derive::Serialize;
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
use std::process::Child;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
process::Child,
|
||||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
@@ -31,6 +32,7 @@ use crate::ipc;
|
||||
|
||||
type Message = RendezvousMessage;
|
||||
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
pub type Children = Arc<Mutex<(bool, HashMap<(String, String), Child>)>>;
|
||||
|
||||
#[derive(Clone, Debug, Serialize)]
|
||||
@@ -1254,3 +1256,10 @@ pub fn handle_relay_id(id: String) -> String {
|
||||
id
|
||||
}
|
||||
}
|
||||
|
||||
pub fn support_remove_wallpaper() -> bool {
|
||||
#[cfg(any(target_os = "windows", target_os = "linux"))]
|
||||
return crate::platform::WallPaperRemover::support();
|
||||
#[cfg(not(any(target_os = "windows", target_os = "linux")))]
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user