diff --git a/Telegram/SourceFiles/kotato/json_settings.cpp b/Telegram/SourceFiles/kotato/json_settings.cpp index d0a6e13f3..53c480de7 100644 --- a/Telegram/SourceFiles/kotato/json_settings.cpp +++ b/Telegram/SourceFiles/kotato/json_settings.cpp @@ -650,10 +650,13 @@ bool Manager::readCustomFile() { }); ReadIntOption(settings, "file_dialog_type", [&](auto v) { - const auto typedValue = Platform::FileDialog::ImplementationType(v); - if (typedValue >= Platform::FileDialog::ImplementationType::Default - && typedValue < Platform::FileDialog::ImplementationType::Count) { - SetFileDialogType(typedValue); + using Platform::FileDialog::ImplementationType; + if (v >= int(ImplementationType::Default) + && v < int(ImplementationType::Count)) { + SetFileDialogType(ImplementationType(v)); + } else if (v >= int(ImplementationType::Count)) { + SetFileDialogType(ImplementationType( + int(ImplementationType::Count) - 1)); } }); diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp index c8eec1ec8..980fecb5e 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp @@ -94,7 +94,6 @@ namespace FileDialog { QString ImplementationTypeLabel(ImplementationType value) { switch (value) { case ImplementationType::XDP: return qsl("XDG Desktop Portal"); - case ImplementationType::GTK: return qsl("GTK"); case ImplementationType::Qt: return qsl("Qt"); } Unexpected("Value in Platform::FileDialog::ImplementationTypeLabel."); @@ -105,14 +104,6 @@ QString ImplementationTypeDescription(ImplementationType value) { #ifdef DESKTOP_APP_DISABLE_DBUS_INTEGRATION case ImplementationType::XDP: return tr::ktg_file_dialog_disabled_on_build(tr::now); #endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION -#ifdef DESKTOP_APP_DISABLE_GTK_INTEGRATION - case ImplementationType::GTK: return tr::ktg_file_dialog_disabled_on_build(tr::now); -#else // DESKTOP_APP_DISABLE_GTK_INTEGRATION - case ImplementationType::GTK: - return GtkIntegration::Instance() - ? QString() - : tr::ktg_file_dialog_disabled_by_option(tr::now); -#endif // !DESKTOP_APP_DISABLE_GTK_INTEGRATION } return QString(); } diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h index e6a336542..bf5cb3816 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h @@ -30,7 +30,6 @@ namespace FileDialog { enum class ImplementationType { Default, XDP, - GTK, Qt, Count, };