diff options
Diffstat (limited to 'src/androidselect.c')
| -rw-r--r-- | src/androidselect.c | 22 |
1 files changed, 11 insertions, 11 deletions
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) | |||
| 568 | 568 | ||
| 569 | /* Display a desktop notification with the provided TITLE, BODY, | 569 | /* Display a desktop notification with the provided TITLE, BODY, |
| 570 | REPLACES_ID, GROUP, ICON, URGENCY, ACTIONS, RESIDENT, ACTION_CB and | 570 | REPLACES_ID, GROUP, ICON, URGENCY, ACTIONS, RESIDENT, ACTION_CB and |
| 571 | CANCEL_CB. Return an identifier for the resulting notification. */ | 571 | CLOSE_CB. Return an identifier for the resulting notification. */ |
| 572 | 572 | ||
| 573 | static intmax_t | 573 | static intmax_t |
| 574 | android_notifications_notify_1 (Lisp_Object title, Lisp_Object body, | 574 | android_notifications_notify_1 (Lisp_Object title, Lisp_Object body, |
| @@ -576,7 +576,7 @@ android_notifications_notify_1 (Lisp_Object title, Lisp_Object body, | |||
| 576 | Lisp_Object group, Lisp_Object icon, | 576 | Lisp_Object group, Lisp_Object icon, |
| 577 | Lisp_Object urgency, Lisp_Object actions, | 577 | Lisp_Object urgency, Lisp_Object actions, |
| 578 | Lisp_Object resident, Lisp_Object action_cb, | 578 | Lisp_Object resident, Lisp_Object action_cb, |
| 579 | Lisp_Object cancel_cb) | 579 | Lisp_Object close_cb) |
| 580 | { | 580 | { |
| 581 | static intmax_t counter; | 581 | static intmax_t counter; |
| 582 | intmax_t id; | 582 | intmax_t id; |
| @@ -740,8 +740,8 @@ android_notifications_notify_1 (Lisp_Object title, Lisp_Object body, | |||
| 740 | 740 | ||
| 741 | /* If callbacks are provided, save them into notification_table. */ | 741 | /* If callbacks are provided, save them into notification_table. */ |
| 742 | 742 | ||
| 743 | if (!NILP (action_cb) || !NILP (cancel_cb) || !NILP (resident)) | 743 | if (!NILP (action_cb) || !NILP (close_cb) || !NILP (resident)) |
| 744 | Fputhash (build_string (identifier), list3 (action_cb, cancel_cb, | 744 | Fputhash (build_string (identifier), list3 (action_cb, close_cb, |
| 745 | resident), | 745 | resident), |
| 746 | notification_table); | 746 | notification_table); |
| 747 | 747 | ||
| @@ -776,7 +776,7 @@ keywords is understood: | |||
| 776 | :on-action Function to call when an action is invoked. | 776 | :on-action Function to call when an action is invoked. |
| 777 | The notification id and the key of the action are | 777 | The notification id and the key of the action are |
| 778 | provided as arguments to the function. | 778 | provided as arguments to the function. |
| 779 | :on-cancel Function to call if the notification is dismissed, | 779 | :on-close Function to call if the notification is dismissed, |
| 780 | with the notification id and the symbol `undefined' | 780 | with the notification id and the symbol `undefined' |
| 781 | for arguments. | 781 | for arguments. |
| 782 | 782 | ||
| @@ -816,7 +816,7 @@ usage: (android-notifications-notify &rest ARGS) */) | |||
| 816 | { | 816 | { |
| 817 | Lisp_Object title, body, replaces_id, group, urgency, resident; | 817 | Lisp_Object title, body, replaces_id, group, urgency, resident; |
| 818 | Lisp_Object icon; | 818 | Lisp_Object icon; |
| 819 | Lisp_Object key, value, actions, action_cb, cancel_cb; | 819 | Lisp_Object key, value, actions, action_cb, close_cb; |
| 820 | ptrdiff_t i; | 820 | ptrdiff_t i; |
| 821 | 821 | ||
| 822 | if (!android_init_gui) | 822 | if (!android_init_gui) |
| @@ -824,7 +824,7 @@ usage: (android-notifications-notify &rest ARGS) */) | |||
| 824 | 824 | ||
| 825 | /* Clear each variable above. */ | 825 | /* Clear each variable above. */ |
| 826 | title = body = replaces_id = group = icon = urgency = actions = Qnil; | 826 | title = body = replaces_id = group = icon = urgency = actions = Qnil; |
| 827 | resident = action_cb = cancel_cb = Qnil; | 827 | resident = action_cb = close_cb = Qnil; |
| 828 | 828 | ||
| 829 | /* If NARGS is odd, error. */ | 829 | /* If NARGS is odd, error. */ |
| 830 | 830 | ||
| @@ -856,8 +856,8 @@ usage: (android-notifications-notify &rest ARGS) */) | |||
| 856 | resident = value; | 856 | resident = value; |
| 857 | else if (EQ (key, QCon_action)) | 857 | else if (EQ (key, QCon_action)) |
| 858 | action_cb = value; | 858 | action_cb = value; |
| 859 | else if (EQ (key, QCon_cancel)) | 859 | else if (EQ (key, QCon_close)) |
| 860 | cancel_cb = value; | 860 | close_cb = value; |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | /* Demand at least TITLE and BODY be present. */ | 863 | /* Demand at least TITLE and BODY be present. */ |
| @@ -884,7 +884,7 @@ usage: (android-notifications-notify &rest ARGS) */) | |||
| 884 | return make_int (android_notifications_notify_1 (title, body, replaces_id, | 884 | return make_int (android_notifications_notify_1 (title, body, replaces_id, |
| 885 | group, icon, urgency, | 885 | group, icon, urgency, |
| 886 | actions, resident, | 886 | actions, resident, |
| 887 | action_cb, cancel_cb)); | 887 | action_cb, close_cb)); |
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | /* Run callbacks in response to a notification being deleted. | 890 | /* Run callbacks in response to a notification being deleted. |
| @@ -1003,7 +1003,7 @@ syms_of_androidselect (void) | |||
| 1003 | DEFSYM (QCactions, ":actions"); | 1003 | DEFSYM (QCactions, ":actions"); |
| 1004 | DEFSYM (QCresident, ":resident"); | 1004 | DEFSYM (QCresident, ":resident"); |
| 1005 | DEFSYM (QCon_action, ":on-action"); | 1005 | DEFSYM (QCon_action, ":on-action"); |
| 1006 | DEFSYM (QCon_cancel, ":on-cancel"); | 1006 | DEFSYM (QCon_close, ":on-close"); |
| 1007 | 1007 | ||
| 1008 | DEFSYM (Qlow, "low"); | 1008 | DEFSYM (Qlow, "low"); |
| 1009 | DEFSYM (Qnormal, "normal"); | 1009 | DEFSYM (Qnormal, "normal"); |