From b01822bdd463dc4860fcf2c38dd81fb5d607e207 Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Sun, 24 Jul 2022 15:30:48 +0200
Subject: [PATCH] Base: Launch NotificationServer at session start-up

---
 Base/etc/SystemServer.ini                  | 8 --------
 Base/home/anon/.config/SystemServer.ini    | 7 +++++++
 Userland/Applets/Network/main.cpp          | 2 +-
 Userland/Libraries/LibGUI/Notification.cpp | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index f102fb5341..5910b8717f 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -10,14 +10,6 @@ KeepAlive=true
 User=lookup
 SystemModes=text,graphical,self-test
 
-[NotificationServer]
-Socket=/tmp/portal/notify
-SocketPermissions=600
-Lazy=true
-Priority=low
-KeepAlive=true
-User=anon
-
 [WindowServer]
 Socket=/tmp/portal/window,/tmp/portal/wm
 SocketPermissions=660
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index 133c395ffb..2e36ee16fa 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -45,6 +45,13 @@ SystemModes=graphical
 MultiInstance=true
 AcceptSocketConnections=true
 
+[NotificationServer]
+Socket=/tmp/user/%uid/portal/notify
+SocketPermissions=600
+Lazy=true
+Priority=low
+KeepAlive=true
+
 [LaunchServer]
 Socket=/tmp/user/%uid/portal/launch
 SocketPermissions=600
diff --git a/Userland/Applets/Network/main.cpp b/Userland/Applets/Network/main.cpp
index 25d3466faa..cf67198a66 100644
--- a/Userland/Applets/Network/main.cpp
+++ b/Userland/Applets/Network/main.cpp
@@ -164,7 +164,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     auto app = TRY(GUI::Application::try_create(arguments));
 
     TRY(Core::System::unveil("/res", "r"));
-    TRY(Core::System::unveil("/tmp/portal/notify", "rw"));
+    TRY(Core::System::unveil("/tmp/user/%uid/portal/notify", "rw"));
     TRY(Core::System::unveil("/proc/net/adapters", "r"));
     TRY(Core::System::unveil("/bin/SystemMonitor", "x"));
     TRY(Core::System::unveil(nullptr, nullptr));
diff --git a/Userland/Libraries/LibGUI/Notification.cpp b/Userland/Libraries/LibGUI/Notification.cpp
index a44c0de46e..b022c9ac4b 100644
--- a/Userland/Libraries/LibGUI/Notification.cpp
+++ b/Userland/Libraries/LibGUI/Notification.cpp
@@ -15,7 +15,7 @@ namespace GUI {
 class ConnectionToNotificationServer final
     : public IPC::ConnectionToServer<NotificationClientEndpoint, NotificationServerEndpoint>
     , public NotificationClientEndpoint {
-    IPC_CLIENT_CONNECTION(ConnectionToNotificationServer, "/tmp/portal/notify"sv)
+    IPC_CLIENT_CONNECTION(ConnectionToNotificationServer, "/tmp/user/%uid/portal/notify"sv)
 
     friend class Notification;