From 6f394d9ee29e8e81107dee91744b63a4d1216cc1 Mon Sep 17 00:00:00 2001
From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com>
Date: Fri, 23 Sep 2022 09:36:47 -0400
Subject: [PATCH] LibConfig+ConfigServer: Make remove_key() synchronous

Previously, when removing keys, the config utility terminated its
connection before changes could be synced.
---
 Userland/Libraries/LibConfig/Client.cpp                 | 2 +-
 Userland/Services/ConfigServer/ConfigServer.ipc         | 2 +-
 Userland/Services/ConfigServer/ConnectionFromClient.cpp | 2 +-
 Userland/Services/ConfigServer/ConnectionFromClient.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Userland/Libraries/LibConfig/Client.cpp b/Userland/Libraries/LibConfig/Client.cpp
index b28bd25dc7..7046300bc0 100644
--- a/Userland/Libraries/LibConfig/Client.cpp
+++ b/Userland/Libraries/LibConfig/Client.cpp
@@ -72,7 +72,7 @@ void Client::write_bool(StringView domain, StringView group, StringView key, boo
 
 void Client::remove_key(StringView domain, StringView group, StringView key)
 {
-    async_remove_key(domain, group, key);
+    remove_key_entry(domain, group, key);
 }
 
 void Client::notify_changed_string_value(String const& domain, String const& group, String const& key, String const& value)
diff --git a/Userland/Services/ConfigServer/ConfigServer.ipc b/Userland/Services/ConfigServer/ConfigServer.ipc
index 2860c875a6..491e24101d 100644
--- a/Userland/Services/ConfigServer/ConfigServer.ipc
+++ b/Userland/Services/ConfigServer/ConfigServer.ipc
@@ -14,5 +14,5 @@ endpoint ConfigServer
     write_string_value(String domain, String group, String key, String value) => ()
     write_i32_value(String domain, String group, String key, i32 value) => ()
     write_bool_value(String domain, String group, String key, bool value)  => ()
-    remove_key(String domain, String group, String key) =|
+    remove_key_entry(String domain, String group, String key) => ()
 }
diff --git a/Userland/Services/ConfigServer/ConnectionFromClient.cpp b/Userland/Services/ConfigServer/ConnectionFromClient.cpp
index fbf86aae33..22bf2370cf 100644
--- a/Userland/Services/ConfigServer/ConnectionFromClient.cpp
+++ b/Userland/Services/ConfigServer/ConnectionFromClient.cpp
@@ -249,7 +249,7 @@ void ConnectionFromClient::write_bool_value(String const& domain, String const&
     });
 }
 
-void ConnectionFromClient::remove_key(String const& domain, String const& group, String const& key)
+void ConnectionFromClient::remove_key_entry(String const& domain, String const& group, String const& key)
 {
     if (!validate_access(domain, group, key))
         return;
diff --git a/Userland/Services/ConfigServer/ConnectionFromClient.h b/Userland/Services/ConfigServer/ConnectionFromClient.h
index 439dc08436..a5ce7e1f4a 100644
--- a/Userland/Services/ConfigServer/ConnectionFromClient.h
+++ b/Userland/Services/ConfigServer/ConnectionFromClient.h
@@ -35,7 +35,7 @@ private:
     virtual void write_string_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] String const& value) override;
     virtual void write_i32_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] i32 value) override;
     virtual void write_bool_value([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key, [[maybe_unused]] bool value) override;
-    virtual void remove_key([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
+    virtual void remove_key_entry([[maybe_unused]] String const& domain, [[maybe_unused]] String const& group, [[maybe_unused]] String const& key) override;
 
     bool validate_access(String const& domain, String const& group, String const& key);
     void sync_dirty_domains_to_disk();