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

Disable Qt's integration mechanism on GTK-based DE to avoid early GTK loading

Browse Source 
This also removes TDESKTOP_USE_GTK_FILE_DIALOG since it doesn't forces GTK dialog for anyone and there is no reason to leave it

TDESKTOP_DISABLE_GTK_INTEGRATION can be also tested via action now
This commit is contained in:
Ilya Fedin
2020-08-04 19:47:01 +04:00
committed by John Preston
parent 1de1747c38
commit 786bedf271
7 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,11 +130,12 @@ bool NativeSupported(Type type = Type::ReadFile) {
// or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
// or if portals is used and operation is to open folder
// and portal doesn't support folder choosing
return Platform::UseGtkFileDialog()
&& (Platform::DesktopEnvironment::IsGtkBased()
return (Platform::DesktopEnvironment::IsGtkBased()
|| Platform::IsGtkIntegrationForced()
|| Platform::UseXDGDesktopPortal())
&& (!Platform::UseXDGDesktopPortal()
&& ((!Platform::UseXDGDesktopPortal() &&
((!Platform::InFlatpak() && !Platform::InSnap())
|| Platform::IsGtkIntegrationForced()))
|| (type == Type::ReadFolder && !Platform::CanOpenDirectoryWithPortal()))
&& Platform::internal::GdkHelperLoaded()
&& (Libs::gtk_widget_hide_on_delete != nullptr)