TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-07 12:20:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct typos and improve code clarity (#14341)

Browse Source 
- Fix 'clipbard' typos in clipboard.rs (function names, comments, strings)
- Fix 'seperate' typo in x11/server.rs comment
- Replace !is_ok() with idiomatic is_err() in updater.rs
- Fix double backtick typo in updater.rs comment

Co-authored-by: Ocean <ocean@Mac-mini-von-Ocean.local>
This commit is contained in:
Nicola Spieser Buiss
2026-02-17 07:29:50 +01:00
committed by GitHub
parent 779b7aaf02
commit 9345fb754a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scrap/src/x11/server.rs
View File

@@ -98,7 +98,7 @@ unsafe fn check_x11_shm_available(c: *mut xcb_connection_t) -> Result<(), Error>
let mut e: *mut xcb_generic_error_t = std::ptr::null_mut(); let mut e: *mut xcb_generic_error_t = std::ptr::null_mut();
let reply = xcb_shm_query_version_reply(c, cookie, &mut e as _); let reply = xcb_shm_query_version_reply(c, cookie, &mut e as _);
if reply.is_null() { if reply.is_null() {
// TODO: Should seperate SHM disabled from SHM not supported? // TODO: Should separate SHM disabled from SHM not supported?
return Err(Error::UnsupportedExtension); return Err(Error::UnsupportedExtension);
} else { } else {
// https://github.com/FFmpeg/FFmpeg/blob/6229e4ac425b4566446edefb67d5c225eb397b58/libavdevice/xcbgrab.c#L229 // https://github.com/FFmpeg/FFmpeg/blob/6229e4ac425b4566446edefb67d5c225eb397b58/libavdevice/xcbgrab.c#L229

10
src/clipboard.rs
View File

@@ -197,7 +197,7 @@ pub fn check_clipboard_cm() -> ResultType<MultiClipboards> {
#[cfg(not(target_os = "android"))] #[cfg(not(target_os = "android"))]
fn update_clipboard_(multi_clipboards: Vec<Clipboard>, side: ClipboardSide) { fn update_clipboard_(multi_clipboards: Vec<Clipboard>, side: ClipboardSide) {
let to_update_data = proto::from_multi_clipbards(multi_clipboards); let to_update_data = proto::from_multi_clipboards(multi_clipboards);
if to_update_data.is_empty() { if to_update_data.is_empty() {
return; return;
} }
@@ -432,7 +432,7 @@ impl ClipboardContext {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let is_kde_x11 = false; let is_kde_x11 = false;
let clear_holder_text = if is_kde_x11 { let clear_holder_text = if is_kde_x11 {
"RustDesk placeholder to clear the file clipbard" "RustDesk placeholder to clear the file clipboard"
} else { } else {
"" ""
} }
@@ -672,7 +672,7 @@ mod proto {
} }
#[cfg(not(target_os = "android"))] #[cfg(not(target_os = "android"))]
pub fn from_multi_clipbards(multi_clipboards: Vec<Clipboard>) -> Vec<ClipboardData> { pub fn from_multi_clipboards(multi_clipboards: Vec<Clipboard>) -> Vec<ClipboardData> {
multi_clipboards multi_clipboards
.into_iter() .into_iter()
.filter_map(from_clipboard) .filter_map(from_clipboard)
@@ -814,7 +814,7 @@ pub mod clipboard_listener {
subscribers: listener_lock.subscribers.clone(), subscribers: listener_lock.subscribers.clone(),
}; };
let (tx_start_res, rx_start_res) = channel(); let (tx_start_res, rx_start_res) = channel();
let h = start_clipbard_master_thread(handler, tx_start_res); let h = start_clipboard_master_thread(handler, tx_start_res);
let shutdown = match rx_start_res.recv() { let shutdown = match rx_start_res.recv() {
Ok((Some(s), _)) => s, Ok((Some(s), _)) => s,
Ok((None, err)) => { Ok((None, err)) => {
@@ -854,7 +854,7 @@ pub mod clipboard_listener {
log::info!("Clipboard listener unsubscribed: {}", name); log::info!("Clipboard listener unsubscribed: {}", name);
} }
fn start_clipbard_master_thread( fn start_clipboard_master_thread(
handler: impl ClipboardHandler + Send + 'static, handler: impl ClipboardHandler + Send + 'static,
tx_start_res: Sender<(Option<Shutdown>, String)>, tx_start_res: Sender<(Option<Shutdown>, String)>,
) -> JoinHandle<()> { ) -> JoinHandle<()> {

4
src/updater.rs
View File

@@ -123,7 +123,7 @@ fn check_update(manually: bool) -> ResultType<()> {
if !(manually || config::Config::get_bool_option(config::keys::OPTION_ALLOW_AUTO_UPDATE)) { if !(manually || config::Config::get_bool_option(config::keys::OPTION_ALLOW_AUTO_UPDATE)) {
return Ok(()); return Ok(());
} }
if !do_check_software_update().is_ok() { if do_check_software_update().is_err() {
// ignore // ignore
return Ok(()); return Ok(());
} }
@@ -185,7 +185,7 @@ fn check_update(manually: bool) -> ResultType<()> {
let mut file = std::fs::File::create(&file_path)?; let mut file = std::fs::File::create(&file_path)?;
file.write_all(&file_data)?; file.write_all(&file_data)?;
} }
// We have checked if the `conns`` is empty before, but we need to check again. // We have checked if the `conns` is empty before, but we need to check again.
// No need to care about the downloaded file here, because it's rare case that the `conns` are empty // No need to care about the downloaded file here, because it's rare case that the `conns` are empty
// before the download, but not empty after the download. // before the download, but not empty after the download.
if has_no_active_conns() { if has_no_active_conns() {