From 29026ce96531d62ca1de08105f6924d572b24c0a Mon Sep 17 00:00:00 2001 From: Bastiaan van der Plaat Date: Wed, 28 Feb 2024 20:56:24 +0100 Subject: [PATCH] Maps: Move TileProviders.json to user independent folder --- .../share/Maps/TileProviders.json} | 0 Userland/Applications/MapsSettings/MapsSettingsWidget.cpp | 2 +- Userland/Applications/MapsSettings/main.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Base/{home/anon/.config/MapsTileProviders.json => usr/share/Maps/TileProviders.json} (100%) diff --git a/Base/home/anon/.config/MapsTileProviders.json b/Base/usr/share/Maps/TileProviders.json similarity index 100% rename from Base/home/anon/.config/MapsTileProviders.json rename to Base/usr/share/Maps/TileProviders.json diff --git a/Userland/Applications/MapsSettings/MapsSettingsWidget.cpp b/Userland/Applications/MapsSettings/MapsSettingsWidget.cpp index 247ace46f0..333e6108d9 100644 --- a/Userland/Applications/MapsSettings/MapsSettingsWidget.cpp +++ b/Userland/Applications/MapsSettings/MapsSettingsWidget.cpp @@ -44,7 +44,7 @@ ErrorOr MapsSettingsWidget::initialize() tile_provider_fields.empend("url_format", "URL format"_string, Gfx::TextAlignment::CenterLeft); tile_provider_fields.empend("attribution_text", "Attribution text"_string, Gfx::TextAlignment::CenterLeft); tile_provider_fields.empend("attribution_url", "Attribution URL"_string, Gfx::TextAlignment::CenterLeft); - auto tile_providers = GUI::JsonArrayModel::create(ByteString::formatted("{}/MapsTileProviders.json", Core::StandardPaths::config_directory()), move(tile_provider_fields)); + auto tile_providers = GUI::JsonArrayModel::create("/usr/share/Maps/TileProviders.json", move(tile_provider_fields)); tile_providers->invalidate(); Vector custom_tile_provider; diff --git a/Userland/Applications/MapsSettings/main.cpp b/Userland/Applications/MapsSettings/main.cpp index 0e8f370d78..f2f6cbdf77 100644 --- a/Userland/Applications/MapsSettings/main.cpp +++ b/Userland/Applications/MapsSettings/main.cpp @@ -18,8 +18,8 @@ ErrorOr serenity_main(Main::Arguments arguments) auto app = TRY(GUI::Application::create(arguments)); - TRY(Core::System::unveil("/home", "r")); TRY(Core::System::unveil("/res", "r")); + TRY(Core::System::unveil("/usr/share/Maps", "r")); TRY(Core::System::unveil("/tmp/session/%sid/portal/config", "rw")); TRY(Core::System::unveil(nullptr, nullptr));