From 8649ac5eaa0447a766b18550787b60639e57a7fb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 10 Jun 2022 09:53:32 -0400
Subject: [PATCH] services: jami-configuration: Rename 'jamid' field to
 'libjami'.

* gnu/services/telephony.scm (gnu):
(jami-configuration)[jamid]: Rename field to...
[libjami]: ... this.
(jami-configuration->command-line-arguments): Adjust accordingly.
(jami-shepherd-services): Likewise.
---
 doc/guix.texi              |  2 +-
 gnu/services/telephony.scm | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6811429cda..2961cf3608 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25543,7 +25543,7 @@ The complete set of available configuration options is detailed below.
 Available @code{jami-configuration} fields are:
 
 @table @asis
-@item @code{jamid} (default: @code{libjami}) (type: package)
+@item @code{libjami} (default: @code{libjami}) (type: package)
 The Jami daemon package to use.
 
 @item @code{dbus} (default: @code{dbus-for-jami}) (type: package)
diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm
index 3b397054a8..0a11e283a0 100644
--- a/gnu/services/telephony.scm
+++ b/gnu/services/telephony.scm
@@ -49,7 +49,7 @@ (define-module (gnu services telephony)
             jami-account-name-server-uri
 
             jami-configuration
-            jami-configuration-jamid
+            jami-configuration-libjami
             jami-configuration-dbus
             jami-configuration-enable-logging?
             jami-configuration-debug?
@@ -228,7 +228,7 @@ (define (jami-account-list? val)
 (define-maybe/no-serialization jami-account-list)
 
 (define-configuration/no-serialization jami-configuration
-  (jamid
+  (libjami
    (file-like libjami)
    "The Jami daemon package to use.")
   (dbus
@@ -266,8 +266,8 @@ (define (jami-configuration->command-line-arguments config)
   "Derive the command line arguments to used to launch the Jami daemon from
 CONFIG, a <jami-configuration> object."
   (match-record config <jami-configuration>
-    (jamid dbus enable-logging? debug? auto-answer?)
-    `(,(file-append jamid "/libexec/jamid")
+    (libjami dbus enable-logging? debug? auto-answer?)
+    `(,(file-append libjami "/libexec/jamid")
       "--persistent"                    ;stay alive after client quits
       ,@(if enable-logging?
             '()                         ;logs go to syslog by default
@@ -302,7 +302,7 @@ (define (jami-dbus-session-activation config)
 
 (define (jami-shepherd-services config)
   "Return a <shepherd-service> running the Jami daemon."
-  (let* ((jamid (jami-configuration-jamid config))
+  (let* ((libjami (jami-configuration-libjami config))
          (nss-certs (jami-configuration-nss-certs config))
          (dbus (jami-configuration-dbus config))
          (dbus-daemon (file-append dbus "/bin/dbus-daemon"))
@@ -524,7 +524,7 @@ (define disable-account-action
                    #:environment-variables
                    ;; This is so that the cx.ring.Ring service D-Bus
                    ;; definition is found by dbus-daemon.
-                   (list (string-append "XDG_DATA_DIRS=" #$jamid "/share"))))
+                   (list (string-append "XDG_DATA_DIRS=" #$libjami "/share"))))
                (stop #~(make-kill-destructor)))
 
               (shepherd-service