From c3dc13e29c624609b851ef50db343074fad2d7cb Mon Sep 17 00:00:00 2001
From: Bruno Victal <mirai@makinata.eu>
Date: Sat, 25 Feb 2023 18:58:03 +0000
Subject: services: desktop: Deprecate 'accountsservice-service' procedure.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/guix.texi (Desktop Services): Replace 'accountsservice-service'
with 'accountsservice-service-type'.
* gnu/services/desktop.scm (accountsservice-service): Deprecate procedure.
(desktop-services-for-system): Use accountsservice-service-type.
* gnu/tests/lightdm.scm (minimal-desktop-services): Ditto.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/services/desktop.scm | 8 +++++---
 gnu/tests/lightdm.scm    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'gnu')

diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 634b240af2..4a790fbdc4 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -126,7 +126,7 @@
             fontconfig-file-system-service
 
             accountsservice-service-type
-            accountsservice-service
+            accountsservice-service  ; deprecated
 
             cups-pk-helper-service-type
             sane-service-type
@@ -1295,7 +1295,9 @@ over D-Bus that can list available accounts, change their passwords, and so
 on.  AccountsService integrates with PolicyKit to enable unprivileged users to
 acquire the capability to modify their system configuration.")))
 
-(define* (accountsservice-service #:key (accountsservice accountsservice))
+(define-deprecated
+  (accountsservice-service #:key (accountsservice accountsservice))
+  accountsservice-service-type
   "Return a service that runs AccountsService, a system service that
 can list available accounts, change their passwords, and so on.
 AccountsService integrates with PolicyKit to enable unprivileged users to
@@ -1858,7 +1860,7 @@ applications needing access to be root.")
          (service avahi-service-type)
          (udisks-service)
          (service upower-service-type)
-         (accountsservice-service)
+         (service accountsservice-service-type)
          (service cups-pk-helper-service-type)
          (service colord-service-type)
          (geoclue-service)
diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm
index 25fa06a9f1..aa97a96939 100644
--- a/gnu/tests/lightdm.scm
+++ b/gnu/tests/lightdm.scm
@@ -46,7 +46,7 @@
 (define minimal-desktop-services
   (list polkit-wheel-service
         (service upower-service-type)
-        (accountsservice-service)
+        (service accountsservice-service-type)
         (service polkit-service-type)
         (service elogind-service-type)
         (dbus-service)
-- 
cgit 1.4.1