From: Po Lu <luangruo@yahoo.com>
Date: Tue, 12 Mar 2024 01:58:51 +0000 (+0800)
Subject: Resolve inconsistency between Android and XDG notifications
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d70773d40b52a916d22aedcc98360c97f0c0deef;p=emacs.git

Resolve inconsistency between Android and XDG notifications

* doc/lispref/os.texi (Desktop Notifications):

* src/androidselect.c (android_notifications_notify_1)
(Fandroid_notifications_notify, android_notification_action)
(syms_of_androidselect): Rename `:on-cancel' to `:on-close'.

(cherry picked from commit 7ea3a464036f123f70d89b4571afcdeb3e650688)
---

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 65c5ed2b4cc..435886320fd 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -3242,7 +3242,7 @@ of parameters analogous to its namesake in
 @item :body @var{body}
 @item :replaces-id @var{replaces-id}
 @item :on-action @var{on-action}
-@item :on-cancel @var{on-cancel}
+@item :on-cancel @var{on-close}
 @item :actions @var{actions}
 @item :resident @var{resident}
 These have the same meaning as they do when used in calls to
diff --git a/src/androidselect.c b/src/androidselect.c
index a5a4c4c2e59..521133976a7 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -568,7 +568,7 @@ android_locate_icon (const char *name)
 
 /* Display a desktop notification with the provided TITLE, BODY,
    REPLACES_ID, GROUP, ICON, URGENCY, ACTIONS, RESIDENT, ACTION_CB and
-   CANCEL_CB.  Return an identifier for the resulting notification.  */
+   CLOSE_CB.  Return an identifier for the resulting notification.  */
 
 static intmax_t
 android_notifications_notify_1 (Lisp_Object title, Lisp_Object body,
@@ -576,7 +576,7 @@ android_notifications_notify_1 (Lisp_Object title, Lisp_Object body,
 				Lisp_Object group, Lisp_Object icon,
 				Lisp_Object urgency, Lisp_Object actions,
 				Lisp_Object resident, Lisp_Object action_cb,
-				Lisp_Object cancel_cb)
+				Lisp_Object close_cb)
 {
   static intmax_t counter;
   intmax_t id;
@@ -740,8 +740,8 @@ android_notifications_notify_1 (Lisp_Object title, Lisp_Object body,
 
   /* If callbacks are provided, save them into notification_table. */
 
-  if (!NILP (action_cb) || !NILP (cancel_cb) || !NILP (resident))
-    Fputhash (build_string (identifier), list3 (action_cb, cancel_cb,
+  if (!NILP (action_cb) || !NILP (close_cb) || !NILP (resident))
+    Fputhash (build_string (identifier), list3 (action_cb, close_cb,
 						resident),
 	      notification_table);
 
@@ -776,7 +776,7 @@ keywords is understood:
   :on-action	Function to call when an action is invoked.
 		The notification id and the key of the action are
 		provided as arguments to the function.
-  :on-cancel	Function to call if the notification is dismissed,
+  :on-close	Function to call if the notification is dismissed,
 		with the notification id and the symbol `undefined'
 		for arguments.
 
@@ -816,7 +816,7 @@ usage: (android-notifications-notify &rest ARGS) */)
 {
   Lisp_Object title, body, replaces_id, group, urgency, resident;
   Lisp_Object icon;
-  Lisp_Object key, value, actions, action_cb, cancel_cb;
+  Lisp_Object key, value, actions, action_cb, close_cb;
   ptrdiff_t i;
 
   if (!android_init_gui)
@@ -824,7 +824,7 @@ usage: (android-notifications-notify &rest ARGS) */)
 
   /* Clear each variable above.  */
   title = body = replaces_id = group = icon = urgency = actions = Qnil;
-  resident = action_cb = cancel_cb = Qnil;
+  resident = action_cb = close_cb = Qnil;
 
   /* If NARGS is odd, error.  */
 
@@ -856,8 +856,8 @@ usage: (android-notifications-notify &rest ARGS) */)
 	resident = value;
       else if (EQ (key, QCon_action))
 	action_cb = value;
-      else if (EQ (key, QCon_cancel))
-	cancel_cb = value;
+      else if (EQ (key, QCon_close))
+	close_cb = value;
     }
 
   /* Demand at least TITLE and BODY be present.  */
@@ -884,7 +884,7 @@ usage: (android-notifications-notify &rest ARGS) */)
   return make_int (android_notifications_notify_1 (title, body, replaces_id,
 						   group, icon, urgency,
 						   actions, resident,
-						   action_cb, cancel_cb));
+						   action_cb, close_cb));
 }
 
 /* Run callbacks in response to a notification being deleted.
@@ -1003,7 +1003,7 @@ syms_of_androidselect (void)
   DEFSYM (QCactions, ":actions");
   DEFSYM (QCresident, ":resident");
   DEFSYM (QCon_action, ":on-action");
-  DEFSYM (QCon_cancel, ":on-cancel");
+  DEFSYM (QCon_close, ":on-close");
 
   DEFSYM (Qlow, "low");
   DEFSYM (Qnormal, "normal");