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

Use unique desktop file name for static binary

Browse Source
This commit is contained in:
Ilya Fedin
2020-09-24 23:29:03 +04:00
committed by John Preston
parent 78d874e9a3
commit 6805085bbc
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,8 +273,11 @@ bool GenerateDesktopFile(
target.write(fileText.toUtf8());
target.close();
DEBUG_LOG(("App Info: removing old .desktop file"));
QFile(qsl("%1telegram.desktop").arg(targetPath)).remove();
if (IsStaticBinary()) {
DEBUG_LOG(("App Info: removing old .desktop files"));
QFile(qsl("%1telegram.desktop").arg(targetPath)).remove();
QFile(qsl("%1telegramdesktop.desktop").arg(targetPath)).remove();
}
return true;
} else {
@@ -957,7 +960,7 @@ QString GetLauncherBasename() {
.arg(cExeName());
}
if (InAppImage() && !cExeName().isEmpty()) {
if ((IsStaticBinary() || InAppImage()) && !cExeName().isEmpty()) {
const auto appimagePath = qsl("file://%1%2")
.arg(cExeDir())
.arg(cExeName())
@@ -974,20 +977,7 @@ QString GetLauncherBasename() {
.arg(AppName.utf16().replace(' ', '_'));
}
const auto possibleBasenames = std::vector<QString>{
qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME)),
qsl("Telegram")
};
for (const auto &it : possibleBasenames) {
if (!QStandardPaths::locate(
QStandardPaths::ApplicationsLocation,
it + qsl(".desktop")).isEmpty()) {
return it;
}
}
return possibleBasenames[0];
return qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME));
}();
return Result;