summaryrefslogtreecommitdiff
path: root/Userland/Services
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-04-29 21:40:59 +0200
committerAndreas Kling <kling@serenityos.org>2021-04-29 22:16:18 +0200
commitdef1f1444aeee2caf6d47d0eb96a18ffc476c3f9 (patch)
tree2cd5b10136486bda1ec35b161100a081337ef514 /Userland/Services
parentb88b19272e2f1876ebe0dac0601f087a62d099c0 (diff)
downloadserenity-def1f1444aeee2caf6d47d0eb96a18ffc476c3f9.zip
WindowServer: Move configuration file to /etc/WindowServer.ini
This was in the /etc/WindowServer/ directory which had nothing else in it, so let's just get rid of the directory and move this up one step.
Diffstat (limited to 'Userland/Services')
-rw-r--r--Userland/Services/WindowServer/AppletManager.cpp2
-rw-r--r--Userland/Services/WindowServer/ClientConnection.cpp2
-rw-r--r--Userland/Services/WindowServer/WindowManager.cpp4
-rw-r--r--Userland/Services/WindowServer/main.cpp6
4 files changed, 7 insertions, 7 deletions
diff --git a/Userland/Services/WindowServer/AppletManager.cpp b/Userland/Services/WindowServer/AppletManager.cpp
index ffeb52ec66..2885441664 100644
--- a/Userland/Services/WindowServer/AppletManager.cpp
+++ b/Userland/Services/WindowServer/AppletManager.cpp
@@ -20,7 +20,7 @@ AppletManager::AppletManager()
{
s_the = this;
- auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+ auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
auto order = wm_config->read_entry("Applet", "Order");
order_vector = order.split(',');
}
diff --git a/Userland/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
index efd7e65a8c..5c980af88a 100644
--- a/Userland/Services/WindowServer/ClientConnection.cpp
+++ b/Userland/Services/WindowServer/ClientConnection.cpp
@@ -738,7 +738,7 @@ OwnPtr<Messages::WindowServer::SetSystemThemeResponse> ClientConnection::handle(
OwnPtr<Messages::WindowServer::GetSystemThemeResponse> ClientConnection::handle(const Messages::WindowServer::GetSystemTheme&)
{
- auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+ auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
auto name = wm_config->read_entry("Theme", "Name");
return make<Messages::WindowServer::GetSystemThemeResponse>(name);
}
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
index ae2768ad7f..30daf61036 100644
--- a/Userland/Services/WindowServer/WindowManager.cpp
+++ b/Userland/Services/WindowServer/WindowManager.cpp
@@ -69,7 +69,7 @@ NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name)
void WindowManager::reload_config()
{
- m_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+ m_config = Core::ConfigFile::open("/etc/WindowServer.ini");
m_double_click_speed = m_config->read_num_entry("Input", "DoubleClickSpeed", 250);
m_hidden_cursor = get_cursor("Hidden");
@@ -1547,7 +1547,7 @@ bool WindowManager::update_theme(String theme_path, String theme_name)
});
MenuManager::the().did_change_theme();
AppletManager::the().did_change_theme();
- auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+ auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
wm_config->write_entry("Theme", "Name", theme_name);
wm_config->sync();
Compositor::the().invalidate_occlusions();
diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp
index d676ec11d2..d581995473 100644
--- a/Userland/Services/WindowServer/main.cpp
+++ b/Userland/Services/WindowServer/main.cpp
@@ -34,8 +34,8 @@ int main(int, char**)
return 1;
}
- if (unveil("/etc/WindowServer/WindowServer.ini", "rwc") < 0) {
- perror("unveil /etc/WindowServer/WindowServer.ini");
+ if (unveil("/etc/WindowServer.ini", "rwc") < 0) {
+ perror("unveil /etc/WindowServer.ini");
return 1;
}
@@ -54,7 +54,7 @@ int main(int, char**)
return 1;
}
- auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+ auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
auto theme_name = wm_config->read_entry("Theme", "Name", "Default");
auto theme = Gfx::load_system_theme(String::formatted("/res/themes/{}.ini", theme_name));