Merge branch 'rustdesk:master' into master

zhangbo8418 · Mar 13, 2024 · 156b471 · 156b471
2 parents 3583409 + c186378
commit 156b471
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/flutter/macos/Runner/Configs/AppInfo.xcconfig b/flutter/macos/Runner/Configs/AppInfo.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = RustDesk
 PRODUCT_BUNDLE_IDENTIFIER = com.carriez.flutterHbb
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2022 Purslane Ltd. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2024 Purslane Ltd. All rights reserved.
diff --git a/res/setup.nsi b/res/setup.nsi
@@ -137,7 +137,7 @@ Section "Install"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\${PRODUCT_NAME}.exe" --uninstall'
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "InstallLocation" "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "Carriez, Inc."
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "Purslane Ltd."
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "HelpLink" "https://www.rustdesk.com/"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "https://www.rustdesk.com/"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLUpdateInfo" "https://www.rustdesk.com/"

diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs
@@ -64,7 +64,7 @@ fn initialize(app_dir: &str) {
     #[cfg(target_os = "ios")]
     {
         use hbb_common::env_logger::*;
-        init_fro_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "debug"));
+        init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "debug"));
     }
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     {

diff --git a/src/main.rs b/src/main.rs
@@ -52,7 +52,7 @@ fn main() {
     );
     let matches = App::new("rustdesk")
         .version(crate::VERSION)
-        .author("CarrieZ Studio<[email protected]>")
+        .author("Purslane Ltd<[email protected]>")
         .about("RustDesk command line tool")
         .args_from_usage(&args)
         .get_matches();