RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 17:47:36 +00:00
Code Issues Activity Actions

WindowServer: Move configuration file to /etc/WindowServer.ini

Browse source 
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.
This commit is contained in:
Andreas Kling 2021-04-29 21:40:59 +02:00
parent b88b19272e
commit def1f1444a
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/WindowServer/AppletManager.cpp
View file

@ -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(',');
}

2
Userland/Services/WindowServer/ClientConnection.cpp
View file

@ -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);
}

4
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -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();

6
Userland/Services/WindowServer/main.cpp
View file

@ -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));