mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-07 18:06:04 +00:00
Code Issues Releases Wiki Activity

Enable Qt tray icon in GNOME and derivatives.

Browse Source 
As tested in Fedora Qt 5.6.2 tray icon works well in GNOME.
Also add more logs about DE and tray icon. Fix #3175 #3188
This commit is contained in:
John Preston
2017-04-03 19:56:20 +03:00
parent 78d245c02c
commit c1aa1c5a0f
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
View File

@@ -26,7 +26,9 @@ namespace {
QString GetEnv(const char *name) {
auto result = getenv(name);
return result ? QString::fromLatin1(result) : QString();
auto value = result ? QString::fromLatin1(result) : QString();
LOG(("Getting DE, %1: '%2'").arg(name).arg(value));
return value;
}
Type Compute() {
@@ -34,7 +36,6 @@ Type Compute() {
auto list = xdgCurrentDesktop.split(':', QString::SkipEmptyParts);
auto desktopSession = GetEnv("DESKTOP_SESSION").toLower();
auto kdeSession = GetEnv("KDE_SESSION_VERSION");
if (!list.isEmpty()) {
if (list.contains("unity")) {
// gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
@@ -87,16 +88,35 @@ Type Compute() {
return Type::Other;
}
Type ComputeAndLog() {
auto result = Compute();
auto name = [result]() -> QString {
switch (result) {
case Type::Other: return "Other";
case Type::Gnome: return "Gnome";
case Type::KDE3: return "KDE3";
case Type::KDE4: return "KDE4";
case Type::KDE5: return "KDE5";
case Type::Unity: return "Unity";
case Type::XFCE: return "XFCE";
case Type::Pantheon: return "Pantheon";
}
return QString::number(static_cast<int>(result));
};
LOG(("DE: %1").arg(name()));
return result;
}
} // namespace
// Thanks Chromium.
Type Get() {
static const auto result = Compute();
static const auto result = ComputeAndLog();
return result;
}
bool TryQtTrayIcon() {
return !IsPantheon() && !IsGnome();
return !IsPantheon();
}
bool PreferAppIndicatorTrayIcon() {
@@ -108,4 +128,4 @@ bool TryUnityCounter() {
}
} // namespace DesktopEnvironment
} // namespace Platform
} // namespace Platform