summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-24 12:25:51 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-04-24 13:01:34 -0700
commit75ba0410baf1ead0e0b3ea05083f09d9f700508c (patch)
tree4745e129b321e91afbdc9403954935cde2e769d3 /net-im/telegram-desktop/files
parentdev-cpp/abseil-cpp: drop old (diff)
downloadgentoo-75ba0410baf1ead0e0b3ea05083f09d9f700508c.tar.gz
gentoo-75ba0410baf1ead0e0b3ea05083f09d9f700508c.tar.bz2
gentoo-75ba0410baf1ead0e0b3ea05083f09d9f700508c.zip
net-im/telegram-desktop: bump to 2.1.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'net-im/telegram-desktop/files')
-rw-r--r--net-im/telegram-desktop/files/2.1.0-kde-dir.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch
new file mode 100644
index 000000000000..b936275e3613
--- /dev/null
+++ b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch
@@ -0,0 +1,51 @@
+From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Tue, 21 Apr 2020 23:05:17 +0400
+Subject: [PATCH] Fix directory opening with portal and use them by default
+ with KDE
+
+---
+ .../SourceFiles/platform/linux/file_utilities_linux.cpp | 6 +++---
+ Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+index 47dd56a411..88f8a69a91 100644
+--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
++++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512;
+ using Type = ::FileDialog::internal::Type;
+
+ #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
+-bool NativeSupported() {
++bool NativeSupported(Type type = Type::ReadFile) {
+ #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG
+ return false;
+ #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG
+- return !Platform::UseXDGDesktopPortal()
++ return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder)
+ && Platform::internal::GdkHelperLoaded()
+ && (Libs::gtk_widget_hide_on_delete != nullptr)
+ && (Libs::gtk_clipboard_store != nullptr)
+@@ -192,7 +192,7 @@ bool Get(
+ parent = parent->window();
+ }
+ #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
+- if (NativeSupported()) {
++ if (NativeSupported(type)) {
+ return GetNative(
+ parent,
+ files,
+diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+index 0bb3963420..c12e5a0780 100644
+--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
++++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() {
+ const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL");
+ const auto portalPresent = IsXDGDesktopPortalPresent();
+
+- return envVar && portalPresent;
++ return (DesktopEnvironment::IsKDE() || envVar) && portalPresent;
+ }();
+
+ return UsePortal;