From ba73905c117da8ba06de54c5d35a707603093815 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Sep 2023 15:54:59 +0400
Subject: [PATCH] Make use of templated XDP::ReadSetting

---
 ui/platform/linux/ui_window_title_linux.cpp | 22 ++++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index cc07b6b..c89c0b4 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -102,24 +102,18 @@ TitleControls::Layout TitleControlsLayout() {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
-		try {
-			using namespace base::Platform::XDP;
+		namespace XDP = base::Platform::XDP;
 
-			const auto decorationLayout = ReadSetting(
-				"org.gnome.desktop.wm.preferences",
-				"button-layout");
+		const auto decorationLayout = XDP::ReadSetting<Glib::ustring>(
+			"org.gnome.desktop.wm.preferences",
+			"button-layout");
 
-			if (!decorationLayout.has_value()) {
-				return std::nullopt;
-			}
-
-			return GtkKeywordsToTitleControlsLayout(
-				QString::fromStdString(
-					decorationLayout->get_dynamic<Glib::ustring>()));
-		} catch (...) {
+		if (!decorationLayout.has_value()) {
+			return std::nullopt;
 		}
 
-		return std::nullopt;
+		return GtkKeywordsToTitleControlsLayout(
+			QString::fromStdString(*decorationLayout));
 	}();
 
 	if (portalResult.has_value()) {