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

Catch ListActivatableNames errors

Browse Source
This commit is contained in:
Ilya Fedin
2021-03-10 11:05:03 +04:00
committed by John Preston
parent d6848c49e8
commit b24cba99e2
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,14 +371,6 @@ bool InSnap() {
return Result;
}
bool AreQtPluginsBundled() {
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
return true;
#else // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
return false;
#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
}
QString AppRuntimeDirectory() {
static const auto Result = [&] {
auto runtimeDir = QStandardPaths::writableLocation(
@@ -659,10 +651,7 @@ void start() {
// Since tdesktop is distributed in static binary form,
// it makes sense to use ibus portal whenever it present
// to ensure compatibility with the maximum range of distributions.
if (AreQtPluginsBundled()
&& !InFlatpak()
&& !InSnap()
&& IsIBusPortalPresent()) {
if (IsIBusPortalPresent()) {
LOG(("IBus portal is present! Using it."));
qputenv("IBUS_USE_PORTAL", "1");
}