void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a method to get flatpak ID

Browse source
This commit is contained in:
Ilya Fedin 2020-07-13 02:54:06 +04:00 • committed by John Preston
parent 256e976167
commit a6fe5c08ad
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -132,6 +132,18 @@ uint FileChooserPortalVersion() {
} }
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
QString FlatpakID() {
static const auto Result = [] {
if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {
return QString::fromLatin1(qgetenv("FLATPAK_ID"));
} else {
return GetLauncherBasename();
}
}();
return Result;
}
QString ProcessNameByPID(const QString &pid) { QString ProcessNameByPID(const QString &pid) {
constexpr auto kMaxPath = 1024; constexpr auto kMaxPath = 1024;
char result[kMaxPath] = { 0 }; char result[kMaxPath] = { 0 };
@ -694,16 +706,7 @@ QString AppRuntimeDirectory() {
QStandardPaths::RuntimeLocation); QStandardPaths::RuntimeLocation);
if (InFlatpak()) { if (InFlatpak()) {
const auto flatpakId = [&] { runtimeDir += qsl("/app/") + FlatpakID();
if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {
return QString::fromLatin1(qgetenv("FLATPAK_ID"));
} else {
return GetLauncherBasename();
}
}();
runtimeDir += qsl("/app/")
+ flatpakId;
} }
if (!QFileInfo::exists(runtimeDir)) { // non-systemd distros if (!QFileInfo::exists(runtimeDir)) { // non-systemd distros
@ -786,7 +789,7 @@ QString GetLauncherFilename() {
QString GetIconName() { QString GetIconName() {
static const auto Result = InFlatpak() static const auto Result = InFlatpak()
? GetLauncherBasename() ? FlatpakID()
: kIconName.utf16(); : kIconName.utf16();
return Result; return Result;
} }