From a1a6676eabebfc7f879a3edc9ddc4f59462fd415 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 13 Mar 2024 12:46:12 +0400 Subject: [PATCH] Get rid of glibmm --- ui/platform/linux/ui_window_title_linux.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp index f9ebe2a..ba1a331 100644 --- a/ui/platform/linux/ui_window_title_linux.cpp +++ b/ui/platform/linux/ui_window_title_linux.cpp @@ -14,8 +14,6 @@ #include "base/platform/linux/base_linux_xsettings.h" #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION -#include - namespace Ui { namespace Platform { namespace internal { @@ -108,9 +106,7 @@ TitleControls::Layout TitleControlsLayout() { #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION const auto portalResult = []() -> std::optional { - namespace XDP = base::Platform::XDP; - - const auto decorationLayout = XDP::ReadSetting( + auto decorationLayout = base::Platform::XDP::ReadSetting( "org.gnome.desktop.wm.preferences", "button-layout"); @@ -119,7 +115,7 @@ TitleControls::Layout TitleControlsLayout() { } return GtkKeywordsToTitleControlsLayout( - QString::fromStdString(*decorationLayout)); + QString::fromStdString(decorationLayout->get_string(nullptr))); }(); if (portalResult.has_value()) {