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

Get rid of GetLauncherFilename

Browse Source 
Use QGuiApplication::desktopFileName directly instead
This commit is contained in:
Ilya Fedin
2021-03-12 08:55:31 +04:00
committed by John Preston
parent 4d9c9bbd6f
commit e493ab12dc
5 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ QString FlatpakID() {
if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {
return qEnvironmentVariable("FLATPAK_ID");
} else {
return GetLauncherBasename();
return cExeName();
}
}();
@@ -275,7 +275,7 @@ bool GenerateDesktopFile(
if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
const auto sourceFile = kDesktopFile.utf16();
const auto targetFile = targetPath + GetLauncherFilename();
const auto targetFile = targetPath + QGuiApplication::desktopFileName();
QString fileText;
@@ -407,37 +407,6 @@ QString SingleInstanceLocalServerName(const QString &hash) {
}
}
QString GetLauncherBasename() {
static const auto Result = [&] {
if (!Core::UpdaterDisabled() && !cExeName().isEmpty()) {
const auto appimagePath = qsl("file://%1%2")
.arg(cExeDir())
.arg(cExeName())
.toUtf8();
char md5Hash[33] = { 0 };
hashMd5Hex(
appimagePath.constData(),
appimagePath.size(),
md5Hash);
return qsl("appimagekit_%1-%2")
.arg(md5Hash)
.arg(AppName.utf16().replace(' ', '_'));
}
return qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME));
}();
return Result;
}
QString GetLauncherFilename() {
static const auto Result = GetLauncherBasename()
+ qsl(".desktop");
return Result;
}
QString GetIconName() {
static const auto Result = InFlatpak()
? FlatpakID()
@@ -616,7 +585,7 @@ int psFixPrevious() {
namespace Platform {
void start() {
LOG(("Launcher filename: %1").arg(GetLauncherFilename()));
LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName()));
qputenv("PULSE_PROP_application.name", AppName.utf8());
qputenv("PULSE_PROP_application.icon_name", GetIconName().toLatin1());
@@ -873,7 +842,7 @@ void psAutoStart(bool start, bool silent) {
if (start) {
GenerateDesktopFile(autostart, qsl("-autostart"), silent);
} else {
QFile::remove(autostart + GetLauncherFilename());
QFile::remove(autostart + QGuiApplication::desktopFileName());
}
}
}