mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 15:45:12 +00:00
Code Issues Releases Wiki Activity

Update SNI state even if tray is deactivated

Browse Source
This commit is contained in:
Ilya Fedin
2020-10-02 18:52:52 +04:00
committed by John Preston
parent f10ef26226
commit a0af748fc5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@@ -568,6 +568,13 @@ void MainWindow::handleSNIOwnerChanged(
const QString &service, const QString &service,
const QString &oldOwner, const QString &oldOwner,
const QString &newOwner) { const QString &newOwner) {
SNIAvailable = !newOwner.isEmpty();
const auto trayAvailable = SNIAvailable
|| QSystemTrayIcon::isSystemTrayAvailable();
Platform::SetTrayIconSupported(trayAvailable);
if (Global::WorkMode().value() == dbiwmWindowOnly) { if (Global::WorkMode().value() == dbiwmWindowOnly) {
return; return;
} }
@@ -586,13 +593,6 @@ void MainWindow::handleSNIOwnerChanged(
} }
trayIcon = nullptr; trayIcon = nullptr;
SNIAvailable = !newOwner.isEmpty();
const auto trayAvailable = SNIAvailable
|| QSystemTrayIcon::isSystemTrayAvailable();
Platform::SetTrayIconSupported(trayAvailable);
if (trayAvailable) { if (trayAvailable) {
psSetupTrayIcon(); psSetupTrayIcon();
} else { } else {

2
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@@ -85,7 +85,7 @@ constexpr auto kXCBFrameExtentsAtomName = "_GTK_FRAME_EXTENTS"_cs;
QStringList PlatformThemes; QStringList PlatformThemes;
bool IsTrayIconSupported = true; bool IsTrayIconSupported = false;
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
void PortalAutostart(bool autostart, bool silent = false) { void PortalAutostart(bool autostart, bool silent = false) {