procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make .desktop file search respect TDESKTOP_LAUNCHER_FILENAME

This commit is contained in:
Konstantin Popov 2019-07-21 21:55:53 +03:00 committed by John Preston
parent 325989ed47
commit b831766375
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/application.h" #include "core/application.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include <vector>
#include <QtDBus> #include <QtDBus>
namespace Platform { namespace Platform {
@ -549,15 +550,25 @@ void MainWindow::psFirstShow() {
if (QDBusInterface("com.canonical.Unity", "/").isValid()) { if (QDBusInterface("com.canonical.Unity", "/").isValid()) {
auto snapName = QString::fromLatin1(qgetenv("SNAP_NAME")); auto snapName = QString::fromLatin1(qgetenv("SNAP_NAME"));
if(snapName.isEmpty()) { if(snapName.isEmpty()) {
if(!QStandardPaths::locate(QStandardPaths::ApplicationsLocation, "telegramdesktop.desktop").isEmpty()) { std::vector<QString> possibleDesktopFiles = {
_desktopFile = "telegramdesktop.desktop"; #ifdef TDESKTOP_LAUNCHER_FILENAME
LOG(("Found Unity Launcher entry telegramdesktop.desktop!")); #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) #V
#define TDESKTOP_LAUNCHER_FILENAME_TO_STRING(V) TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V)
TDESKTOP_LAUNCHER_FILENAME_TO_STRING(TDESKTOP_LAUNCHER_FILENAME),
#endif // TDESKTOP_LAUNCHER_FILENAME
"telegramdesktop.desktop",
"Telegram.desktop"
};
for (auto it = possibleDesktopFiles.begin(); it != possibleDesktopFiles.end(); it++) {
if (!QStandardPaths::locate(QStandardPaths::ApplicationsLocation, *it).isEmpty()) {
_desktopFile = *it;
LOG(("Found Unity Launcher entry %1!").arg(_desktopFile));
useUnityCount = true; useUnityCount = true;
} else if(!QStandardPaths::locate(QStandardPaths::ApplicationsLocation, "Telegram.desktop").isEmpty()) { break;
_desktopFile = "Telegram.desktop"; }
LOG(("Found Unity Launcher entry Telegram.desktop!")); }
useUnityCount=true; if (!useUnityCount) {
} else {
LOG(("Could not get Unity Launcher entry!")); LOG(("Could not get Unity Launcher entry!"));
} }
} else { } else {