From f635453e8089c7c5f688c9bb48d82011cec72812 Mon Sep 17 00:00:00 2001
From: RustDesk <71636191+rustdesk@users.noreply.github.com>
Date: Sun, 25 Jun 2023 00:45:33 +0800
Subject: [PATCH] Revert "linux tray as mac tray"

---
 Cargo.toml                                          |   4 +---
 ...tlined-tray-dark-x2.png => mac-tray-dark-x2.png} | Bin
 ...ined-tray-light-x2.png => mac-tray-light-x2.png} | Bin
 src/tray.rs                                         |   9 ++++-----
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename res/{outlined-tray-dark-x2.png => mac-tray-dark-x2.png} (100%)
 rename res/{outlined-tray-light-x2.png => mac-tray-light-x2.png} (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 1d956177e..35745e5f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ flutter = ["flutter_rust_bridge"]
 default = ["use_dasp"]
 hwcodec = ["scrap/hwcodec"]
 mediacodec = ["scrap/mediacodec"]
-linux_headless = ["pam"]
+linux_headless = ["pam" ]
 virtual_display_driver = ["virtual_display"]
 plugin_framework = []
 linux-pkg-config = ["magnum-opus/linux-pkg-config", "scrap/linux-pkg-config"]
@@ -127,8 +127,6 @@ dbus = "0.9"
 dbus-crossroads = "0.5"
 pam = { git="https://github.com/fufesou/pam", optional = true }
 users = { version = "0.11" }
-dark-light = "1.0"
-
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13"
diff --git a/res/outlined-tray-dark-x2.png b/res/mac-tray-dark-x2.png
similarity index 100%
rename from res/outlined-tray-dark-x2.png
rename to res/mac-tray-dark-x2.png
diff --git a/res/outlined-tray-light-x2.png b/res/mac-tray-light-x2.png
similarity index 100%
rename from res/outlined-tray-light-x2.png
rename to res/mac-tray-light-x2.png
diff --git a/src/tray.rs b/src/tray.rs
index 0486615f6..092f1edd5 100644
--- a/src/tray.rs
+++ b/src/tray.rs
@@ -12,17 +12,17 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
         TrayEvent, TrayIconBuilder,
     };
     let icon;
-    #[cfg(any(target_os = "macos", target_os = "linux"))]
+    #[cfg(target_os = "macos")]
     {
         let mode = dark_light::detect();
-        const LIGHT: &[u8] = include_bytes!("../res/outlined-tray-light-x2.png");
-        const DARK: &[u8] = include_bytes!("../res/outlined-tray-dark-x2.png");
+        const LIGHT: &[u8] = include_bytes!("../res/mac-tray-light-x2.png");
+        const DARK: &[u8] = include_bytes!("../res/mac-tray-dark-x2.png");
         icon = match mode {
             dark_light::Mode::Dark => LIGHT,
             _ => DARK,
         };
     }
-    #[cfg(target_os = "windows")]
+    #[cfg(not(target_os = "macos"))]
     {
         icon = include_bytes!("../res/tray-icon.ico");
     }
@@ -74,7 +74,6 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
                 .spawn()
                 .ok();
         }
-        // xdg-open?
         #[cfg(target_os = "linux")]
         if !std::process::Command::new("xdg-open")
             .arg("rustdesk://")