From ede7ad1a4cf2335770216ebd32168527aa29507b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 4 Nov 2020 11:35:02 +0400 Subject: [PATCH] Remove TDESKTOP_FORCE_PANEL_ICON variable since tdesktop gets current icon theme just fine now --- Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 0cf024d9b6..c46d375a39 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -58,7 +58,6 @@ namespace Platform { namespace { constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs; -constexpr auto kForcePanelIcon = "TDESKTOP_FORCE_PANEL_ICON"_cs; constexpr auto kPanelTrayIconName = "telegram-panel"_cs; constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs; constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs; @@ -149,8 +148,7 @@ QString GetTrayIconName(int counter, bool muted) { const auto iconName = GetIconName(); const auto panelIconName = GetPanelIconName(counter, muted); - if (QIcon::hasThemeIcon(panelIconName) - || qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) { + if (QIcon::hasThemeIcon(panelIconName)) { return panelIconName; } else if (QIcon::hasThemeIcon(iconName)) { return iconName;