RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux-desktop-environment: detect Ubuntu properly enabling features 

In Ubuntu (running in GNOME) we support AppIndicator and
Unity counters still.
This commit is contained in:
Marco Trevisan (Treviño) 2018-02-08 20:43:29 +01:00 committed by John Preston
parent 9dc3847dbe
commit 0de9c62675
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,9 @@ Type Compute() {
} else if (list.contains("pantheon")) {
return Type::Pantheon;
} else if (list.contains("gnome")) {
if (list.contains("ubuntu"))
return Type::Ubuntu;
return Type::Gnome;
} else if (list.contains("kde")) {
if (kdeSession == qstr("5")) {
@ -88,6 +91,7 @@ Type ComputeAndLog() {
case Type::KDE3: return "KDE3";
case Type::KDE4: return "KDE4";
case Type::KDE5: return "KDE5";
case Type::Ubuntu: return "Ubuntu";
case Type::Unity: return "Unity";
case Type::XFCE: return "XFCE";
case Type::Pantheon: return "Pantheon";
@ -112,12 +116,12 @@ bool TryQtTrayIcon() {
}
bool PreferAppIndicatorTrayIcon() {
return IsXFCE() || IsUnity() ||
return IsXFCE() || IsUnity() || IsUbuntu() ||
(IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid());
}
bool TryUnityCounter() {
return IsUnity() || IsPantheon();
return IsUnity() || IsPantheon() || IsUbuntu();
}
} // namespace DesktopEnvironment

5
Telegram/SourceFiles/platform/linux/linux_desktop_environment.h
View File

@ -16,6 +16,7 @@ enum class Type {
KDE3,
KDE4,
KDE5,
Ubuntu,
Unity,
XFCE,
Pantheon,
@ -44,6 +45,10 @@ inline bool IsKDE() {
return IsKDE3() || IsKDE4() || IsKDE5();
}
inline bool IsUbuntu() {
return Get() == Type::Ubuntu;
}
inline bool IsUnity() {
return Get() == Type::Unity;
}