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

Always ask for TDESKTOP_LAUNCHER_BASENAME on Linux.

Browse Source
This commit is contained in:
John Preston
2020-01-21 18:39:13 +03:00
parent f0dc912080
commit 48b24d12b2
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@@ -548,10 +548,7 @@ void MainWindow::psFirstShow() {
auto snapName = QString::fromLatin1(qgetenv("SNAP_NAME"));
if(snapName.isEmpty()) {
std::vector<QString> possibleDesktopFiles = {
#ifdef TDESKTOP_LAUNCHER_FILENAME
MACRO_TO_STRING(TDESKTOP_LAUNCHER_FILENAME),
#endif // TDESKTOP_LAUNCHER_FILENAME
"telegramdesktop.desktop",
MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME) + ".desktop",
"Telegram.desktop"
};

7
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@@ -145,13 +145,8 @@ NotificationData::NotificationData(
_hints["category"] = qsl("im.received");
#ifdef TDESKTOP_LAUNCHER_FILENAME
_hints["desktop-entry"] =
qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_FILENAME))
.remove(QRegExp(qsl("\\.desktop$"), Qt::CaseInsensitive));
#else
_hints["desktop-entry"] = qsl("telegramdesktop");
#endif
qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME));
connect(_notificationInterface.get(),
SIGNAL(NotificationClosed(uint, uint)),