From 45eb128a5e4f9a7f4f5b13ed79b7d5013b7d2acc Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jan 2018 17:36:11 +0100 Subject: [PATCH] Fixed issue with running both clients (kepka and tdesktop) simultaneously. Signed-off-by: Vitaly Zaitsev --- Telegram/SourceFiles/main.cpp | 6 +++--- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index 6e28040a0..c9d1ae3be 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) { // Retina display support is working fine, others are not. QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); #endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + QCoreApplication::setApplicationName(qsl("Kepka")); InitFromCommandLine(argc, argv); if (cLaunchMode() == LaunchModeFixPrevious) { @@ -49,10 +49,10 @@ int main(int argc, char *argv[]) { result = app.exec(); } - DEBUG_LOG(("Telegram finished, result: %1").arg(result)); + DEBUG_LOG(("Kepka finished, result: %1").arg(result)); if (cRestarting()) { - DEBUG_LOG(("Application Info: executing Telegram, because of restart...")); + DEBUG_LOG(("Application Info: executing Kepka, because of restart...")); psExecTelegram(); } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 3cfa95df2..8f802365d 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -313,7 +313,7 @@ QString psAppDataPath() { // If we find data there, we should still use it. auto home = getHomeDir(); if (!home.isEmpty()) { - auto oldPath = home + qsl(".TelegramDesktop/"); + auto oldPath = home + qsl(".Kepka/"); auto oldSettingsBase = oldPath + qsl("tdata/settings"); if (QFile(oldSettingsBase + '0').exists() || QFile(oldSettingsBase + '1').exists()) { return oldPath; @@ -462,7 +462,7 @@ void psRegisterCustomScheme() { s << "Exec=" << EscapeShell(QFile::encodeName(cExeDir() + cExeName())) << " -- %u\n"; s << "Icon=telegram\n"; s << "Terminal=false\n"; - s << "StartupWMClass=TelegramDesktop\n"; + s << "StartupWMClass=Kepka\n"; s << "Type=Application\n"; s << "Categories=Network;InstantMessaging;Qt;\n"; s << "MimeType=x-scheme-handler/tg;\n";