Subject: [PATCH 17/27] services: desktop: Deprecate 'accountsservice-service' procedure.

From: Bruno Victal <[email-masked]>
Date: Sat, 25 Feb 2023 18:58:03 +0000

* 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.
---
 doc/guix.texi            | 15 +++++++--------
 gnu/services/desktop.scm |  8 +++++---
 gnu/tests/lightdm.scm    |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 2d69f94aa0..1831528ef3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -23420,18 +23420,17 @@ Desktop Services
 @end table
 @end deftp
 
-@deffn {Scheme Procedure} accountsservice-service @
-       [#:accountsservice @var{accountsservice}]
-Return a service that runs AccountsService, a system service that can
+@defvar accountsservice-service-type
+Type for the 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 acquire the capability to modify their system configuration.
-@uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the
-accountsservice web site} for more information.
+See @url{https://www.freedesktop.org/wiki/Software/AccountsService/,
+AccountsService} for more information.
 
-The @var{accountsservice} keyword argument is the @code{accountsservice}
-package to expose as a service.
-@end deffn
+The value for this service is a file-like object, by default it is
+set to @code{accountsservice} (the package object for AccountsService).
+@end defvar
 
 @deffn {Scheme Procedure} polkit-service @
                          [#:polkit @var{polkit}]
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index cd3d8efa55..24d9d9f0c3 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -124,7 +124,7 @@ (define-module (gnu services desktop)
             fontconfig-file-system-service
 
             accountsservice-service-type
-            accountsservice-service
+            accountsservice-service  ; deprecated
 
             cups-pk-helper-service-type
             sane-service-type
@@ -1281,7 +1281,9 @@ (define accountsservice-service-type
 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
@@ -1799,7 +1801,7 @@ (define* (desktop-services-for-system #:optional
          (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-module (gnu tests lightdm)
 (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)
-- 
2.39.1