From 4bcda01993c562f73035f208f4dd44c02aa15225 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 5 Oct 2023 23:27:34 -0400
Subject: [PATCH] Remove deprecated gtk goo
---
indra/cmake/00-Common.cmake | 4 ----
indra/newview/lldirpicker.cpp | 10 ----------
2 files changed, 14 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index f7a2f2273c8..814665fb69b 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -180,10 +180,6 @@ if (LINUX)
LL_IGNORE_SIGCHLD
_REENTRANT
$<$<CONFIG:Release>:_FORTIFY_SOURCE=2>
- GDK_DISABLE_DEPRECATED
- GTK_DISABLE_DEPRECATED
- GSEAL_ENABLE
- GTK_DISABLE_SINGLE_INCLUDES
)
add_compile_options(
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 392e38732fd..7e9ddc071a2 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -330,16 +330,6 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
if (mFilePicker)
{
- GtkWindow* picker = mFilePicker->buildFilePicker(false, true,
- "dirpicker");
-
- if (picker)
- {
- gtk_window_set_title(GTK_WINDOW(picker), LLTrans::getString("choose_the_directory").c_str());
- gtk_widget_show_all(GTK_WIDGET(picker));
- gtk_main();
- return (!mFilePicker->getFirstFile().empty());
- }
}
#endif // !LL_MESA_HEADLESS
--
GitLab